Skip to content

Commit 0432798

Browse files
borsbors
committed
Auto merge of #57194 - matthiaskrgr:copyright_headers, r=Centril
remove more copyright headers r? @Mark-Simulacrum
2 parents d8371c6 + 8d727b2 commit 0432798

23 files changed

+13
-213
lines changed

‎src/doc/rust.css

-12
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
/**
2-
* Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
3-
* file at the top-level directory of this distribution and at
4-
* http://rust-lang.org/COPYRIGHT.
5-
* With elements taken from Bootstrap v3.0.2 (MIT licensed).
6-
*
7-
* Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
8-
* http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
9-
* <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
10-
* option. This file may not be copied, modified, or distributed
11-
* except according to those terms.
12-
*/
131
@font-face {
142
font-family: 'Fira Sans';
153
font-style: normal;

‎src/libstd/sys/sgx/ext/arch.rs

-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
10-
111
//! SGX-specific access to architectural features.
122
//!
133
//! The functionality in this module is further documented in the Intel

‎src/libstd/sys/sgx/ext/io.rs

-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
10-
111
//! SGX-specific extensions to general I/O primitives
122
//!
133
//! SGX file descriptors behave differently from Unix file descriptors. See the

‎src/libstd/sys/sgx/ext/mod.rs

-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
10-
111
#![unstable(feature = "sgx_platform", issue = "56975")]
122

133
pub mod arch;

‎src/test/rustdoc/issue-56822.rs

-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
10-
111
struct Wrapper<T>(T);
122

133
trait MyTrait {

‎src/test/rustfix/closure-immutable-outer-variable.fixed

-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
10-
111
// Point at the captured immutable outer variable
122

133
fn foo(mut f: Box<FnMut()>) {

‎src/test/rustfix/empty-no-fixes.fixed

-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1 @@
1-
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
10-
111
// compile-flags:--crate-type lib

‎src/test/rustfix/empty-no-fixes.rs.fixed

-10
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,2 @@
1-
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
10-
111
// compile-flags:--crate-type lib
122
fn foo() {}

‎src/test/rustfix/issue-45562.fixed

-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
10-
111
#[no_mangle] pub static RAH: usize = 5;
122

133
fn main() {}

‎src/test/rustfix/issue-45799-bad-extern-crate-rename-suggestion-formatting.fixed

-10
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,2 @@
1-
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
10-
111
extern crate std as other_std;
122
fn main() {}

‎src/test/rustfix/issue-46756-consider-borrowing-cast-or-binexpr.fixed

-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
10-
111
#![allow(unused)]
122

133
fn light_flows_our_war_of_mocking_words(and_yet: &usize) -> usize {

‎src/test/rustfix/main-no-fixes.fixed

-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1 @@
1-
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
10-
111
fn main() {}

‎src/test/rustfix/main-no-fixes.rs.fixed

-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1 @@
1-
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
10-
111
fn main() {}

‎src/test/rustfix/missing-comma-in-match.fixed

-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
10-
111
fn main() {
122
match &Some(3) {
133
&None => 1,

‎src/test/rustfix/str-as-char.fixed

-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
10-
111
fn main() {
122
println!("●●");
133
}

‎src/test/rustfix/tuple-float-index.fixed

-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
10-
111
// compile-flags: -Z parse-only
122

133
fn main () {

‎src/test/ui/attr-bad-crate-attr.rc

-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
10-
111
// error-pattern: expected item
122

133
#![attr = "val"]

‎src/test/ui/closures/closure-immutable-outer-variable.rs.fixed

-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
10-
111
// Point at the captured immutable outer variable
122

133
fn foo(mut f: Box<FnMut()>) {

‎src/test/ui/kindck/kindck-send-unsafe.rs~rust-lang_master

-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
10-
111
fn assert_send<T:Send>() { }
122

133
// unsafe ptrs are ok unless they point at unsendable things

‎src/test/ui/lint/lint-group-nonstandard-style.rs

-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
// Copyright 2014–2017 The Rust Project Developers. See the COPYRIGHT
2-
// http://rust-lang.org/COPYRIGHT.
3-
//
4-
51
#![deny(nonstandard_style)]
62
#![allow(dead_code)]
73

‎src/test/ui/lint/lint-group-nonstandard-style.stderr

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,63 @@
11
warning: type `snake_case` should have a camel case name such as `SnakeCase`
2-
--> $DIR/lint-group-nonstandard-style.rs:26:9
2+
--> $DIR/lint-group-nonstandard-style.rs:22:9
33
|
44
LL | struct snake_case; //~ WARN should have a camel
55
| ^^^^^^^^^^^^^^^^^^
66
|
77
note: lint level defined here
8-
--> $DIR/lint-group-nonstandard-style.rs:22:17
8+
--> $DIR/lint-group-nonstandard-style.rs:18:17
99
|
1010
LL | #![warn(nonstandard_style)]
1111
| ^^^^^^^^^^^^^^^^^
1212
= note: #[warn(non_camel_case_types)] implied by #[warn(nonstandard_style)]
1313

1414
error: function `CamelCase` should have a snake case name such as `camel_case`
15-
--> $DIR/lint-group-nonstandard-style.rs:8:1
15+
--> $DIR/lint-group-nonstandard-style.rs:4:1
1616
|
1717
LL | fn CamelCase() {} //~ ERROR should have a snake
1818
| ^^^^^^^^^^^^^^^^^
1919
|
2020
note: lint level defined here
21-
--> $DIR/lint-group-nonstandard-style.rs:5:9
21+
--> $DIR/lint-group-nonstandard-style.rs:1:9
2222
|
2323
LL | #![deny(nonstandard_style)]
2424
| ^^^^^^^^^^^^^^^^^
2525
= note: #[deny(non_snake_case)] implied by #[deny(nonstandard_style)]
2626

2727
error: function `CamelCase` should have a snake case name such as `camel_case`
28-
--> $DIR/lint-group-nonstandard-style.rs:16:9
28+
--> $DIR/lint-group-nonstandard-style.rs:12:9
2929
|
3030
LL | fn CamelCase() {} //~ ERROR should have a snake
3131
| ^^^^^^^^^^^^^^^^^
3232
|
3333
note: lint level defined here
34-
--> $DIR/lint-group-nonstandard-style.rs:14:14
34+
--> $DIR/lint-group-nonstandard-style.rs:10:14
3535
|
3636
LL | #[forbid(nonstandard_style)]
3737
| ^^^^^^^^^^^^^^^^^
3838
= note: #[forbid(non_snake_case)] implied by #[forbid(nonstandard_style)]
3939

4040
error: static variable `bad` should have an upper case name such as `BAD`
41-
--> $DIR/lint-group-nonstandard-style.rs:18:9
41+
--> $DIR/lint-group-nonstandard-style.rs:14:9
4242
|
4343
LL | static bad: isize = 1; //~ ERROR should have an upper
4444
| ^^^^^^^^^^^^^^^^^^^^^^
4545
|
4646
note: lint level defined here
47-
--> $DIR/lint-group-nonstandard-style.rs:14:14
47+
--> $DIR/lint-group-nonstandard-style.rs:10:14
4848
|
4949
LL | #[forbid(nonstandard_style)]
5050
| ^^^^^^^^^^^^^^^^^
5151
= note: #[forbid(non_upper_case_globals)] implied by #[forbid(nonstandard_style)]
5252

5353
warning: function `CamelCase` should have a snake case name such as `camel_case`
54-
--> $DIR/lint-group-nonstandard-style.rs:24:9
54+
--> $DIR/lint-group-nonstandard-style.rs:20:9
5555
|
5656
LL | fn CamelCase() {} //~ WARN should have a snake
5757
| ^^^^^^^^^^^^^^^^^
5858
|
5959
note: lint level defined here
60-
--> $DIR/lint-group-nonstandard-style.rs:22:17
60+
--> $DIR/lint-group-nonstandard-style.rs:18:17
6161
|
6262
LL | #![warn(nonstandard_style)]
6363
| ^^^^^^^^^^^^^^^^^

‎src/test/ui/lint/not_found.rs

-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
// Copyright 2014–2017 The Rust Project Developers. See the COPYRIGHT
2-
// http://rust-lang.org/COPYRIGHT.
3-
//
4-
51
// compile-pass
62

73
// this tests the `unknown_lint` lint, especially the suggestions

‎src/test/ui/lint/not_found.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
warning: unknown lint: `FOO_BAR`
2-
--> $DIR/not_found.rs:10:9
2+
--> $DIR/not_found.rs:6:9
33
|
44
LL | #[allow(FOO_BAR)]
55
| ^^^^^^^
66
|
77
= note: #[warn(unknown_lints)] on by default
88

99
warning: unknown lint: `DEAD_CODE`
10-
--> $DIR/not_found.rs:12:8
10+
--> $DIR/not_found.rs:8:8
1111
|
1212
LL | #[warn(DEAD_CODE)]
1313
| ^^^^^^^^^ help: did you mean: `dead_code`
1414

1515
warning: unknown lint: `Warnings`
16-
--> $DIR/not_found.rs:14:8
16+
--> $DIR/not_found.rs:10:8
1717
|
1818
LL | #[deny(Warnings)]
1919
| ^^^^^^^^ help: did you mean: `warnings`

0 commit comments

Comments
 (0)