Auto merge of #57108 - Mark-Simulacrum:license-remove, r=pietroalbini

Remove header licenses across the project

This pull request removes the header licenses from files across the Rust repository.

I've attempted to check for any remaining headers and removed all of them -- any we've missed can be removed in the future; there's nothing blocking that.

Unfortunately, not all of the changes are as basic as "removing a header" because some of them required test file updates or otherwise. However, I am fairly confident that the changes in this pull request, while wide-sweeping, are unlikely to actually make any tests fail to properly test the code; any non-script based changes were manual and carefully verified.

r? @pietroalbini cc @rust-lang/infra

24 files changed, 38 insertions, 168 deletions

diff --git a/src/test/ui/empty/auxiliary/empty-struct.rs b/src/test/ui/empty/auxiliary/empty-struct.rs
index 4a302865634..3fb40f6bfa9 100644
--- a/src/test/ui/empty/auxiliary/empty-struct.rs
+++ b/src/test/ui/empty/auxiliary/empty-struct.rs
@@ -1,13 +1,3 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 pub struct XEmpty1 {}
 pub struct XEmpty2;
 pub struct XEmpty6();
diff --git a/src/test/ui/empty/auxiliary/two_macros.rs b/src/test/ui/empty/auxiliary/two_macros.rs
index 060960f0dbc..2330c75c8e0 100644
--- a/src/test/ui/empty/auxiliary/two_macros.rs
+++ b/src/test/ui/empty/auxiliary/two_macros.rs
@@ -1,13 +1,3 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[macro_export]
 macro_rules! macro_one { () => ("one") }
 
diff --git a/src/test/ui/empty/empty-comment.rs b/src/test/ui/empty/empty-comment.rs
index a5568ff826b..174274d28b0 100644
--- a/src/test/ui/empty/empty-comment.rs
+++ b/src/test/ui/empty/empty-comment.rs
@@ -1,13 +1,3 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // `/**/` was previously regarded as a doc comment because it starts with `/**` and ends with `*/`.
 // This could break some internal logic that assumes the length of a doc comment is at least 5,
 // leading to an ICE.
diff --git a/src/test/ui/empty/empty-comment.stderr b/src/test/ui/empty/empty-comment.stderr
index d1b031c1f6c..908d5710c8a 100644
--- a/src/test/ui/empty/empty-comment.stderr
+++ b/src/test/ui/empty/empty-comment.stderr
@@ -1,5 +1,5 @@
 error: unexpected end of macro invocation
-  --> $DIR/empty-comment.rs:20:5
+  --> $DIR/empty-comment.rs:10:5
    |
 LL | macro_rules! one_arg_macro {
    | -------------------------- when calling this macro
diff --git a/src/test/ui/empty/empty-linkname.rs b/src/test/ui/empty/empty-linkname.rs
index 20e0f9cd0b2..79895ab5834 100644
--- a/src/test/ui/empty/empty-linkname.rs
+++ b/src/test/ui/empty/empty-linkname.rs
@@ -1,13 +1,3 @@
-// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[link(name = "")] //~ ERROR: given with empty name
 extern {
 }
diff --git a/src/test/ui/empty/empty-linkname.stderr b/src/test/ui/empty/empty-linkname.stderr
index 9a637aa7833..a07a4f1c567 100644
--- a/src/test/ui/empty/empty-linkname.stderr
+++ b/src/test/ui/empty/empty-linkname.stderr
@@ -1,5 +1,5 @@
 error[E0454]: #[link(name = "")] given with empty name
-  --> $DIR/empty-linkname.rs:11:1
+  --> $DIR/empty-linkname.rs:1:1
    |
 LL | #[link(name = "")] //~ ERROR: given with empty name
    | ^^^^^^^^^^^^^^^^^^ empty name given
diff --git a/src/test/ui/empty/empty-macro-use.rs b/src/test/ui/empty/empty-macro-use.rs
index 823a7426079..846004e661d 100644
--- a/src/test/ui/empty/empty-macro-use.rs
+++ b/src/test/ui/empty/empty-macro-use.rs
@@ -1,13 +1,3 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // aux-build:two_macros.rs
 
 #[macro_use()]
diff --git a/src/test/ui/empty/empty-macro-use.stderr b/src/test/ui/empty/empty-macro-use.stderr
index 8feb0930718..16300411c8c 100644
--- a/src/test/ui/empty/empty-macro-use.stderr
+++ b/src/test/ui/empty/empty-macro-use.stderr
@@ -1,5 +1,5 @@
 error: cannot find macro `macro_two!` in this scope
-  --> $DIR/empty-macro-use.rs:17:5
+  --> $DIR/empty-macro-use.rs:7:5
    |
 LL |     macro_two!();
    |     ^^^^^^^^^
diff --git a/src/test/ui/empty/empty-never-array.rs b/src/test/ui/empty/empty-never-array.rs
index 53b24e17319..01b99134a44 100644
--- a/src/test/ui/empty/empty-never-array.rs
+++ b/src/test/ui/empty/empty-never-array.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(never_type)]
 
 enum Helper<T, U> {
diff --git a/src/test/ui/empty/empty-never-array.stderr b/src/test/ui/empty/empty-never-array.stderr
index d9ef2f30aab..e409f14d6ce 100644
--- a/src/test/ui/empty/empty-never-array.stderr
+++ b/src/test/ui/empty/empty-never-array.stderr
@@ -1,5 +1,5 @@
 error[E0005]: refutable pattern in local binding: `T(_, _)` not covered
-  --> $DIR/empty-never-array.rs:20:9
+  --> $DIR/empty-never-array.rs:10:9
    |
 LL |     let Helper::U(u) = Helper::T(t, []);
    |         ^^^^^^^^^^^^ pattern `T(_, _)` not covered
diff --git a/src/test/ui/empty/empty-struct-braces-expr.rs b/src/test/ui/empty/empty-struct-braces-expr.rs
index 3096e8f8313..2f2f41ae8c1 100644
--- a/src/test/ui/empty/empty-struct-braces-expr.rs
+++ b/src/test/ui/empty/empty-struct-braces-expr.rs
@@ -1,13 +1,3 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // Can't use empty braced struct as constant or constructor function
 
 // aux-build:empty-struct.rs
diff --git a/src/test/ui/empty/empty-struct-braces-expr.stderr b/src/test/ui/empty/empty-struct-braces-expr.stderr
index 9b6114875e2..be613121fe8 100644
--- a/src/test/ui/empty/empty-struct-braces-expr.stderr
+++ b/src/test/ui/empty/empty-struct-braces-expr.stderr
@@ -1,5 +1,5 @@
 error[E0423]: expected value, found struct `Empty1`
-  --> $DIR/empty-struct-braces-expr.rs:25:14
+  --> $DIR/empty-struct-braces-expr.rs:15:14
    |
 LL |     let e1 = Empty1; //~ ERROR expected value, found struct `Empty1`
    |              ^^^^^^
@@ -8,7 +8,7 @@ LL |     let e1 = Empty1; //~ ERROR expected value, found struct `Empty1`
    |              did you mean `Empty1 { /* fields */ }`?
 
 error[E0423]: expected function, found struct `Empty1`
-  --> $DIR/empty-struct-braces-expr.rs:26:14
+  --> $DIR/empty-struct-braces-expr.rs:16:14
    |
 LL |     let e1 = Empty1(); //~ ERROR expected function, found struct `Empty1`
    |              ^^^^^^
@@ -17,19 +17,19 @@ LL |     let e1 = Empty1(); //~ ERROR expected function, found struct `Empty1`
    |              did you mean `Empty1 { /* fields */ }`?
 
 error[E0423]: expected value, found struct variant `E::Empty3`
-  --> $DIR/empty-struct-braces-expr.rs:27:14
+  --> $DIR/empty-struct-braces-expr.rs:17:14
    |
 LL |     let e3 = E::Empty3; //~ ERROR expected value, found struct variant `E::Empty3`
    |              ^^^^^^^^^ did you mean `E::Empty3 { /* fields */ }`?
 
 error[E0423]: expected function, found struct variant `E::Empty3`
-  --> $DIR/empty-struct-braces-expr.rs:28:14
+  --> $DIR/empty-struct-braces-expr.rs:18:14
    |
 LL |     let e3 = E::Empty3(); //~ ERROR expected function, found struct variant `E::Empty3`
    |              ^^^^^^^^^ did you mean `E::Empty3 { /* fields */ }`?
 
 error[E0423]: expected value, found struct `XEmpty1`
-  --> $DIR/empty-struct-braces-expr.rs:30:15
+  --> $DIR/empty-struct-braces-expr.rs:20:15
    |
 LL |     let xe1 = XEmpty1; //~ ERROR expected value, found struct `XEmpty1`
    |               ^^^^^^^
@@ -38,7 +38,7 @@ LL |     let xe1 = XEmpty1; //~ ERROR expected value, found struct `XEmpty1`
    |               did you mean `XEmpty1 { /* fields */ }`?
 
 error[E0423]: expected function, found struct `XEmpty1`
-  --> $DIR/empty-struct-braces-expr.rs:31:15
+  --> $DIR/empty-struct-braces-expr.rs:21:15
    |
 LL |     let xe1 = XEmpty1(); //~ ERROR expected function, found struct `XEmpty1`
    |               ^^^^^^^
@@ -47,7 +47,7 @@ LL |     let xe1 = XEmpty1(); //~ ERROR expected function, found struct `XEmpty1
    |               did you mean `XEmpty1 { /* fields */ }`?
 
 error[E0599]: no variant named `Empty3` found for type `empty_struct::XE` in the current scope
-  --> $DIR/empty-struct-braces-expr.rs:32:15
+  --> $DIR/empty-struct-braces-expr.rs:22:15
    |
 LL |     let xe3 = XE::Empty3; //~ ERROR no variant named `Empty3` found for type
    |               ^^^^^^^^^^ variant not found in `empty_struct::XE`
@@ -55,7 +55,7 @@ LL |     let xe3 = XE::Empty3; //~ ERROR no variant named `Empty3` found for typ
    = note: did you mean `empty_struct::XE::XEmpty3`?
 
 error[E0599]: no variant named `Empty3` found for type `empty_struct::XE` in the current scope
-  --> $DIR/empty-struct-braces-expr.rs:33:15
+  --> $DIR/empty-struct-braces-expr.rs:23:15
    |
 LL |     let xe3 = XE::Empty3(); //~ ERROR no variant named `Empty3` found for type
    |               ^^^^^^^^^^ variant not found in `empty_struct::XE`
diff --git a/src/test/ui/empty/empty-struct-braces-pat-1.rs b/src/test/ui/empty/empty-struct-braces-pat-1.rs
index e527170e9f9..81062320fe4 100644
--- a/src/test/ui/empty/empty-struct-braces-pat-1.rs
+++ b/src/test/ui/empty/empty-struct-braces-pat-1.rs
@@ -1,13 +1,3 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // Can't use empty braced struct as constant pattern
 
 // aux-build:empty-struct.rs
diff --git a/src/test/ui/empty/empty-struct-braces-pat-1.stderr b/src/test/ui/empty/empty-struct-braces-pat-1.stderr
index aad47f4d954..f43262574fb 100644
--- a/src/test/ui/empty/empty-struct-braces-pat-1.stderr
+++ b/src/test/ui/empty/empty-struct-braces-pat-1.stderr
@@ -1,11 +1,11 @@
 error[E0532]: expected unit struct/variant or constant, found struct variant `E::Empty3`
-  --> $DIR/empty-struct-braces-pat-1.rs:34:9
+  --> $DIR/empty-struct-braces-pat-1.rs:24:9
    |
 LL |         E::Empty3 => ()
    |         ^^^^^^^^^ did you mean `E::Empty3 { /* fields */ }`?
 
 error[E0532]: expected unit struct/variant or constant, found struct variant `XE::XEmpty3`
-  --> $DIR/empty-struct-braces-pat-1.rs:41:9
+  --> $DIR/empty-struct-braces-pat-1.rs:31:9
    |
 LL |         XE::XEmpty3 => ()
    |         ^^^^-------
diff --git a/src/test/ui/empty/empty-struct-braces-pat-2.rs b/src/test/ui/empty/empty-struct-braces-pat-2.rs
index d3b13457dc6..187d953d805 100644
--- a/src/test/ui/empty/empty-struct-braces-pat-2.rs
+++ b/src/test/ui/empty/empty-struct-braces-pat-2.rs
@@ -1,13 +1,3 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // Can't use empty braced struct as enum pattern
 
 // aux-build:empty-struct.rs
diff --git a/src/test/ui/empty/empty-struct-braces-pat-2.stderr b/src/test/ui/empty/empty-struct-braces-pat-2.stderr
index 26fb42c4e94..8c55b2119f1 100644
--- a/src/test/ui/empty/empty-struct-braces-pat-2.stderr
+++ b/src/test/ui/empty/empty-struct-braces-pat-2.stderr
@@ -1,5 +1,5 @@
 error[E0532]: expected tuple struct/variant, found struct `Empty1`
-  --> $DIR/empty-struct-braces-pat-2.rs:25:9
+  --> $DIR/empty-struct-braces-pat-2.rs:15:9
    |
 LL |         Empty1() => () //~ ERROR expected tuple struct/variant, found struct `Empty1`
    |         ^^^^^^
@@ -8,7 +8,7 @@ LL |         Empty1() => () //~ ERROR expected tuple struct/variant, found struc
    |         did you mean `Empty1 { /* fields */ }`?
 
 error[E0532]: expected tuple struct/variant, found struct `XEmpty1`
-  --> $DIR/empty-struct-braces-pat-2.rs:28:9
+  --> $DIR/empty-struct-braces-pat-2.rs:18:9
    |
 LL |         XEmpty1() => () //~ ERROR expected tuple struct/variant, found struct `XEmpty1`
    |         ^^^^^^^
@@ -17,7 +17,7 @@ LL |         XEmpty1() => () //~ ERROR expected tuple struct/variant, found stru
    |         did you mean `XEmpty1 { /* fields */ }`?
 
 error[E0532]: expected tuple struct/variant, found struct `Empty1`
-  --> $DIR/empty-struct-braces-pat-2.rs:31:9
+  --> $DIR/empty-struct-braces-pat-2.rs:21:9
    |
 LL |         Empty1(..) => () //~ ERROR expected tuple struct/variant, found struct `Empty1`
    |         ^^^^^^
@@ -26,7 +26,7 @@ LL |         Empty1(..) => () //~ ERROR expected tuple struct/variant, found str
    |         did you mean `Empty1 { /* fields */ }`?
 
 error[E0532]: expected tuple struct/variant, found struct `XEmpty1`
-  --> $DIR/empty-struct-braces-pat-2.rs:34:9
+  --> $DIR/empty-struct-braces-pat-2.rs:24:9
    |
 LL |         XEmpty1(..) => () //~ ERROR expected tuple struct/variant, found struct `XEmpty1`
    |         ^^^^^^^
diff --git a/src/test/ui/empty/empty-struct-braces-pat-3.rs b/src/test/ui/empty/empty-struct-braces-pat-3.rs
index d6c5b953492..fad28d78fe5 100644
--- a/src/test/ui/empty/empty-struct-braces-pat-3.rs
+++ b/src/test/ui/empty/empty-struct-braces-pat-3.rs
@@ -1,13 +1,3 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // Can't use empty braced struct as enum pattern
 
 // aux-build:empty-struct.rs
diff --git a/src/test/ui/empty/empty-struct-braces-pat-3.stderr b/src/test/ui/empty/empty-struct-braces-pat-3.stderr
index 389bf0a65c6..17670cb0bd6 100644
--- a/src/test/ui/empty/empty-struct-braces-pat-3.stderr
+++ b/src/test/ui/empty/empty-struct-braces-pat-3.stderr
@@ -1,11 +1,11 @@
 error[E0532]: expected tuple struct/variant, found struct variant `E::Empty3`
-  --> $DIR/empty-struct-braces-pat-3.rs:27:9
+  --> $DIR/empty-struct-braces-pat-3.rs:17:9
    |
 LL |         E::Empty3() => ()
    |         ^^^^^^^^^ did you mean `E::Empty3 { /* fields */ }`?
 
 error[E0532]: expected tuple struct/variant, found struct variant `XE::XEmpty3`
-  --> $DIR/empty-struct-braces-pat-3.rs:31:9
+  --> $DIR/empty-struct-braces-pat-3.rs:21:9
    |
 LL |         XE::XEmpty3() => ()
    |         ^^^^-------
@@ -14,13 +14,13 @@ LL |         XE::XEmpty3() => ()
    |         did you mean `XE::XEmpty3 { /* fields */ }`?
 
 error[E0532]: expected tuple struct/variant, found struct variant `E::Empty3`
-  --> $DIR/empty-struct-braces-pat-3.rs:35:9
+  --> $DIR/empty-struct-braces-pat-3.rs:25:9
    |
 LL |         E::Empty3(..) => ()
    |         ^^^^^^^^^ did you mean `E::Empty3 { /* fields */ }`?
 
 error[E0532]: expected tuple struct/variant, found struct variant `XE::XEmpty3`
-  --> $DIR/empty-struct-braces-pat-3.rs:39:9
+  --> $DIR/empty-struct-braces-pat-3.rs:29:9
    |
 LL |         XE::XEmpty3(..) => ()
    |         ^^^^-------
diff --git a/src/test/ui/empty/empty-struct-tuple-pat.rs b/src/test/ui/empty/empty-struct-tuple-pat.rs
index 5e683eafade..00a48594e93 100644
--- a/src/test/ui/empty/empty-struct-tuple-pat.rs
+++ b/src/test/ui/empty/empty-struct-tuple-pat.rs
@@ -1,13 +1,3 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // Can't use unit struct as enum pattern
 
 // aux-build:empty-struct.rs
diff --git a/src/test/ui/empty/empty-struct-tuple-pat.stderr b/src/test/ui/empty/empty-struct-tuple-pat.stderr
index 3708aa36089..4cb869e64a5 100644
--- a/src/test/ui/empty/empty-struct-tuple-pat.stderr
+++ b/src/test/ui/empty/empty-struct-tuple-pat.stderr
@@ -1,5 +1,5 @@
 error[E0530]: match bindings cannot shadow tuple structs
-  --> $DIR/empty-struct-tuple-pat.rs:32:9
+  --> $DIR/empty-struct-tuple-pat.rs:22:9
    |
 LL | struct Empty2();
    | ---------------- the tuple struct `Empty2` is defined here
@@ -8,7 +8,7 @@ LL |         Empty2 => () //~ ERROR match bindings cannot shadow tuple structs
    |         ^^^^^^ cannot be named the same as a tuple struct
 
 error[E0530]: match bindings cannot shadow tuple structs
-  --> $DIR/empty-struct-tuple-pat.rs:35:9
+  --> $DIR/empty-struct-tuple-pat.rs:25:9
    |
 LL | use empty_struct::*;
    |     --------------- the tuple struct `XEmpty6` is imported here
@@ -17,13 +17,13 @@ LL |         XEmpty6 => () //~ ERROR match bindings cannot shadow tuple structs
    |         ^^^^^^^ cannot be named the same as a tuple struct
 
 error[E0532]: expected unit struct/variant or constant, found tuple variant `E::Empty4`
-  --> $DIR/empty-struct-tuple-pat.rs:39:9
+  --> $DIR/empty-struct-tuple-pat.rs:29:9
    |
 LL |         E::Empty4 => ()
    |         ^^^^^^^^^ not a unit struct/variant or constant
 
 error[E0532]: expected unit struct/variant or constant, found tuple variant `XE::XEmpty5`
-  --> $DIR/empty-struct-tuple-pat.rs:43:9
+  --> $DIR/empty-struct-tuple-pat.rs:33:9
    |
 LL |         XE::XEmpty5 => (),
    |         ^^^^-------
diff --git a/src/test/ui/empty/empty-struct-unit-expr.rs b/src/test/ui/empty/empty-struct-unit-expr.rs
index 941292a7ec2..b192e3a92c3 100644
--- a/src/test/ui/empty/empty-struct-unit-expr.rs
+++ b/src/test/ui/empty/empty-struct-unit-expr.rs
@@ -1,13 +1,3 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // Can't use unit struct as constructor function
 
 // aux-build:empty-struct.rs
diff --git a/src/test/ui/empty/empty-struct-unit-expr.stderr b/src/test/ui/empty/empty-struct-unit-expr.stderr
index 360e0c6f107..b3519948f64 100644
--- a/src/test/ui/empty/empty-struct-unit-expr.stderr
+++ b/src/test/ui/empty/empty-struct-unit-expr.stderr
@@ -1,5 +1,5 @@
 error[E0618]: expected function, found `Empty2`
-  --> $DIR/empty-struct-unit-expr.rs:25:14
+  --> $DIR/empty-struct-unit-expr.rs:15:14
    |
 LL | struct Empty2;
    | -------------- `Empty2` defined here
@@ -10,7 +10,7 @@ LL |     let e2 = Empty2(); //~ ERROR expected function, found `Empty2`
    |              call expression requires function
 
 error[E0618]: expected function, found enum variant `E::Empty4`
-  --> $DIR/empty-struct-unit-expr.rs:26:14
+  --> $DIR/empty-struct-unit-expr.rs:16:14
    |
 LL |     Empty4
    |     ------ `E::Empty4` defined here
@@ -25,7 +25,7 @@ LL |     let e4 = E::Empty4;
    |              ^^^^^^^^^
 
 error[E0618]: expected function, found `empty_struct::XEmpty2`
-  --> $DIR/empty-struct-unit-expr.rs:28:15
+  --> $DIR/empty-struct-unit-expr.rs:18:15
    |
 LL |     let xe2 = XEmpty2(); //~ ERROR expected function, found `empty_struct::XEmpty2`
    |               ^^^^^^^--
@@ -33,7 +33,7 @@ LL |     let xe2 = XEmpty2(); //~ ERROR expected function, found `empty_struct::
    |               call expression requires function
 
 error[E0618]: expected function, found enum variant `XE::XEmpty4`
-  --> $DIR/empty-struct-unit-expr.rs:29:15
+  --> $DIR/empty-struct-unit-expr.rs:19:15
    |
 LL |     let xe4 = XE::XEmpty4();
    |               ^^^^^^^^^^^--
diff --git a/src/test/ui/empty/empty-struct-unit-pat.rs b/src/test/ui/empty/empty-struct-unit-pat.rs
index 532c2d85053..8a0e2f505e4 100644
--- a/src/test/ui/empty/empty-struct-unit-pat.rs
+++ b/src/test/ui/empty/empty-struct-unit-pat.rs
@@ -1,13 +1,3 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // Can't use unit struct as tuple struct pattern
 
 // aux-build:empty-struct.rs
diff --git a/src/test/ui/empty/empty-struct-unit-pat.stderr b/src/test/ui/empty/empty-struct-unit-pat.stderr
index 042b53521c2..3711bd6dcb7 100644
--- a/src/test/ui/empty/empty-struct-unit-pat.stderr
+++ b/src/test/ui/empty/empty-struct-unit-pat.stderr
@@ -1,35 +1,35 @@
 error[E0532]: expected tuple struct/variant, found unit struct `Empty2`
-  --> $DIR/empty-struct-unit-pat.rs:31:9
+  --> $DIR/empty-struct-unit-pat.rs:21:9
    |
 LL |         Empty2() => () //~ ERROR expected tuple struct/variant, found unit struct `Empty2`
    |         ^^^^^^ did you mean `XEmpty6`?
 
 error[E0532]: expected tuple struct/variant, found unit struct `XEmpty2`
-  --> $DIR/empty-struct-unit-pat.rs:34:9
+  --> $DIR/empty-struct-unit-pat.rs:24:9
    |
 LL |         XEmpty2() => () //~ ERROR expected tuple struct/variant, found unit struct `XEmpty2`
    |         ^^^^^^^ did you mean `XEmpty6`?
 
 error[E0532]: expected tuple struct/variant, found unit struct `Empty2`
-  --> $DIR/empty-struct-unit-pat.rs:37:9
+  --> $DIR/empty-struct-unit-pat.rs:27:9
    |
 LL |         Empty2(..) => () //~ ERROR expected tuple struct/variant, found unit struct `Empty2`
    |         ^^^^^^ did you mean `XEmpty6`?
 
 error[E0532]: expected tuple struct/variant, found unit struct `XEmpty2`
-  --> $DIR/empty-struct-unit-pat.rs:40:9
+  --> $DIR/empty-struct-unit-pat.rs:30:9
    |
 LL |         XEmpty2(..) => () //~ ERROR expected tuple struct/variant, found unit struct `XEmpty2`
    |         ^^^^^^^ did you mean `XEmpty6`?
 
 error[E0532]: expected tuple struct/variant, found unit variant `E::Empty4`
-  --> $DIR/empty-struct-unit-pat.rs:44:9
+  --> $DIR/empty-struct-unit-pat.rs:34:9
    |
 LL |         E::Empty4() => () //~ ERROR expected tuple struct/variant, found unit variant `E::Empty4`
    |         ^^^^^^^^^ not a tuple struct/variant
 
 error[E0532]: expected tuple struct/variant, found unit variant `XE::XEmpty4`
-  --> $DIR/empty-struct-unit-pat.rs:47:9
+  --> $DIR/empty-struct-unit-pat.rs:37:9
    |
 LL |         XE::XEmpty4() => (),
    |         ^^^^-------
@@ -37,13 +37,13 @@ LL |         XE::XEmpty4() => (),
    |             did you mean `XEmpty5`?
 
 error[E0532]: expected tuple struct/variant, found unit variant `E::Empty4`
-  --> $DIR/empty-struct-unit-pat.rs:52:9
+  --> $DIR/empty-struct-unit-pat.rs:42:9
    |
 LL |         E::Empty4(..) => () //~ ERROR expected tuple struct/variant, found unit variant `E::Empty4`
    |         ^^^^^^^^^ not a tuple struct/variant
 
 error[E0532]: expected tuple struct/variant, found unit variant `XE::XEmpty4`
-  --> $DIR/empty-struct-unit-pat.rs:55:9
+  --> $DIR/empty-struct-unit-pat.rs:45:9
    |
 LL |         XE::XEmpty4(..) => (),
    |         ^^^^-------