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

54 files changed, 69 insertions, 349 deletions

diff --git a/src/test/ui/structs/auxiliary/struct_field_privacy.rs b/src/test/ui/structs/auxiliary/struct_field_privacy.rs
index 5fea97da03e..9765af1a7f6 100644
--- a/src/test/ui/structs/auxiliary/struct_field_privacy.rs
+++ b/src/test/ui/structs/auxiliary/struct_field_privacy.rs
@@ -1,13 +1,3 @@
-// Copyright 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.
-
 pub struct A {
     a: isize,
     pub b: isize,
diff --git a/src/test/ui/structs/auxiliary/struct_variant_privacy.rs b/src/test/ui/structs/auxiliary/struct_variant_privacy.rs
index 40868fa3f70..425ec0e96d3 100644
--- a/src/test/ui/structs/auxiliary/struct_variant_privacy.rs
+++ b/src/test/ui/structs/auxiliary/struct_variant_privacy.rs
@@ -1,13 +1,3 @@
-// Copyright 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.
-
 enum Bar {
     Baz { a: isize }
 }
diff --git a/src/test/ui/structs/struct-base-wrong-type-2.rs b/src/test/ui/structs/struct-base-wrong-type-2.rs
index 7e5510edb2c..a88c5d1c13b 100644
--- a/src/test/ui/structs/struct-base-wrong-type-2.rs
+++ b/src/test/ui/structs/struct-base-wrong-type-2.rs
@@ -1,13 +1,3 @@
-// Copyright 2013 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.
-
 // Check that `base` in `Fru { field: expr, ..base }` must have right type.
 //
 // See also struct-base-wrong-type.rs, which tests same condition
diff --git a/src/test/ui/structs/struct-base-wrong-type-2.stderr b/src/test/ui/structs/struct-base-wrong-type-2.stderr
index aab5ed0a74a..44ac3483ad6 100644
--- a/src/test/ui/structs/struct-base-wrong-type-2.stderr
+++ b/src/test/ui/structs/struct-base-wrong-type-2.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/struct-base-wrong-type-2.rs:21:27
+  --> $DIR/struct-base-wrong-type-2.rs:11:27
    |
 LL |     let f = Foo { a: 2, ..b }; //~  ERROR mismatched types
    |                           ^ expected struct `Foo`, found struct `Bar`
@@ -8,7 +8,7 @@ LL |     let f = Foo { a: 2, ..b }; //~  ERROR mismatched types
               found type `Bar`
 
 error[E0308]: mismatched types
-  --> $DIR/struct-base-wrong-type-2.rs:25:34
+  --> $DIR/struct-base-wrong-type-2.rs:15:34
    |
 LL |     let f__isize = Foo { a: 2, ..4 }; //~  ERROR mismatched types
    |                                  ^ expected struct `Foo`, found integral variable
diff --git a/src/test/ui/structs/struct-base-wrong-type.rs b/src/test/ui/structs/struct-base-wrong-type.rs
index 3703b15d4db..83b54448151 100644
--- a/src/test/ui/structs/struct-base-wrong-type.rs
+++ b/src/test/ui/structs/struct-base-wrong-type.rs
@@ -1,13 +1,3 @@
-// Copyright 2013 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.
-
 // Check that `base` in `Fru { field: expr, ..base }` must have right type.
 //
 // See also struct-base-wrong-type-2.rs, which tests same condition
diff --git a/src/test/ui/structs/struct-base-wrong-type.stderr b/src/test/ui/structs/struct-base-wrong-type.stderr
index 2c87f52ee04..8519a9510a9 100644
--- a/src/test/ui/structs/struct-base-wrong-type.stderr
+++ b/src/test/ui/structs/struct-base-wrong-type.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/struct-base-wrong-type.rs:20:33
+  --> $DIR/struct-base-wrong-type.rs:10:33
    |
 LL | static foo: Foo = Foo { a: 2, ..bar }; //~  ERROR mismatched types
    |                                 ^^^ expected struct `Foo`, found struct `Bar`
@@ -8,7 +8,7 @@ LL | static foo: Foo = Foo { a: 2, ..bar }; //~  ERROR mismatched types
               found type `Bar`
 
 error[E0308]: mismatched types
-  --> $DIR/struct-base-wrong-type.rs:24:35
+  --> $DIR/struct-base-wrong-type.rs:14:35
    |
 LL | static foo_i: Foo = Foo { a: 2, ..4 }; //~  ERROR mismatched types
    |                                   ^ expected struct `Foo`, found integral variable
diff --git a/src/test/ui/structs/struct-duplicate-comma.rs b/src/test/ui/structs/struct-duplicate-comma.rs
index d7ee2f220d4..2d4551c55ed 100644
--- a/src/test/ui/structs/struct-duplicate-comma.rs
+++ b/src/test/ui/structs/struct-duplicate-comma.rs
@@ -1,13 +1,3 @@
-// Copyright 2018 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.
-
 // compile-flags: -Z parse-only
 
 // Issue #50974
diff --git a/src/test/ui/structs/struct-duplicate-comma.stderr b/src/test/ui/structs/struct-duplicate-comma.stderr
index 06e3b95c248..112ea905025 100644
--- a/src/test/ui/structs/struct-duplicate-comma.stderr
+++ b/src/test/ui/structs/struct-duplicate-comma.stderr
@@ -1,5 +1,5 @@
 error: expected identifier, found `,`
-  --> $DIR/struct-duplicate-comma.rs:22:14
+  --> $DIR/struct-duplicate-comma.rs:12:14
    |
 LL |     let bar = Foo {
    |               --- while parsing this struct
diff --git a/src/test/ui/structs/struct-field-cfg.rs b/src/test/ui/structs/struct-field-cfg.rs
index 974d500d9cb..42cab8ab916 100644
--- a/src/test/ui/structs/struct-field-cfg.rs
+++ b/src/test/ui/structs/struct-field-cfg.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.
-
 struct Foo {
     present: (),
 }
diff --git a/src/test/ui/structs/struct-field-cfg.stderr b/src/test/ui/structs/struct-field-cfg.stderr
index db4790659c3..c8c624d548b 100644
--- a/src/test/ui/structs/struct-field-cfg.stderr
+++ b/src/test/ui/structs/struct-field-cfg.stderr
@@ -1,11 +1,11 @@
 error[E0063]: missing field `present` in initializer of `Foo`
-  --> $DIR/struct-field-cfg.rs:17:13
+  --> $DIR/struct-field-cfg.rs:7:13
    |
 LL |     let _ = Foo { #[cfg(any())] present: () };
    |             ^^^ missing `present`
 
 error[E0560]: struct `Foo` has no field named `absent`
-  --> $DIR/struct-field-cfg.rs:20:46
+  --> $DIR/struct-field-cfg.rs:10:46
    |
 LL |     let _ = Foo { present: (), #[cfg(all())] absent: () };
    |                                              ^^^^^^ `Foo` does not have this field
@@ -13,13 +13,13 @@ LL |     let _ = Foo { present: (), #[cfg(all())] absent: () };
    = note: available fields are: `present`
 
 error[E0027]: pattern does not mention field `present`
-  --> $DIR/struct-field-cfg.rs:23:9
+  --> $DIR/struct-field-cfg.rs:13:9
    |
 LL |     let Foo { #[cfg(any())] present: () } = foo;
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing field `present`
 
 error[E0026]: struct `Foo` does not have a field named `absent`
-  --> $DIR/struct-field-cfg.rs:26:42
+  --> $DIR/struct-field-cfg.rs:16:42
    |
 LL |     let Foo { present: (), #[cfg(all())] absent: () } = foo;
    |                                          ^^^^^^^^^^ struct `Foo` does not have this field
diff --git a/src/test/ui/structs/struct-field-init-syntax.rs b/src/test/ui/structs/struct-field-init-syntax.rs
index f1e24495f84..31463992aca 100644
--- a/src/test/ui/structs/struct-field-init-syntax.rs
+++ b/src/test/ui/structs/struct-field-init-syntax.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.
-
 // compile-flags: -Z parse-only
 
 // issue #41834
diff --git a/src/test/ui/structs/struct-field-init-syntax.stderr b/src/test/ui/structs/struct-field-init-syntax.stderr
index 2c4ae0e472b..cd8f6b975b6 100644
--- a/src/test/ui/structs/struct-field-init-syntax.stderr
+++ b/src/test/ui/structs/struct-field-init-syntax.stderr
@@ -1,5 +1,5 @@
 error: cannot use a comma after the base struct
-  --> $DIR/struct-field-init-syntax.rs:18:9
+  --> $DIR/struct-field-init-syntax.rs:8:9
    |
 LL |         ..Foo::default(),
    |         ^^^^^^^^^^^^^^^^- help: remove this comma
@@ -7,7 +7,7 @@ LL |         ..Foo::default(),
    = note: the base struct must always be the last field
 
 error: cannot use a comma after the base struct
-  --> $DIR/struct-field-init-syntax.rs:23:9
+  --> $DIR/struct-field-init-syntax.rs:13:9
    |
 LL |         ..Foo::default(),
    |         ^^^^^^^^^^^^^^^^- help: remove this comma
diff --git a/src/test/ui/structs/struct-field-privacy.rs b/src/test/ui/structs/struct-field-privacy.rs
index f487ef62aa4..5c35c04a69f 100644
--- a/src/test/ui/structs/struct-field-privacy.rs
+++ b/src/test/ui/structs/struct-field-privacy.rs
@@ -1,13 +1,3 @@
-// Copyright 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.
-
 // aux-build:struct_field_privacy.rs
 
 extern crate struct_field_privacy as xc;
diff --git a/src/test/ui/structs/struct-field-privacy.stderr b/src/test/ui/structs/struct-field-privacy.stderr
index ad3ee12637a..5e30a4e403d 100644
--- a/src/test/ui/structs/struct-field-privacy.stderr
+++ b/src/test/ui/structs/struct-field-privacy.stderr
@@ -1,29 +1,29 @@
 error[E0616]: field `a` of struct `inner::A` is private
-  --> $DIR/struct-field-privacy.rs:33:5
+  --> $DIR/struct-field-privacy.rs:23:5
    |
 LL |     b.a; //~ ERROR: field `a` of struct `inner::A` is private
    |     ^^^
 
 error[E0616]: field `b` of struct `inner::B` is private
-  --> $DIR/struct-field-privacy.rs:36:5
+  --> $DIR/struct-field-privacy.rs:26:5
    |
 LL |     c.b; //~ ERROR: field `b` of struct `inner::B` is private
    |     ^^^
 
 error[E0616]: field `a` of struct `xc::A` is private
-  --> $DIR/struct-field-privacy.rs:38:5
+  --> $DIR/struct-field-privacy.rs:28:5
    |
 LL |     d.a; //~ ERROR: field `a` of struct `xc::A` is private
    |     ^^^
 
 error[E0616]: field `b` of struct `xc::B` is private
-  --> $DIR/struct-field-privacy.rs:42:5
+  --> $DIR/struct-field-privacy.rs:32:5
    |
 LL |     e.b; //~ ERROR: field `b` of struct `xc::B` is private
    |     ^^^
 
 error[E0616]: field `1` of struct `inner::Z` is private
-  --> $DIR/struct-field-privacy.rs:45:5
+  --> $DIR/struct-field-privacy.rs:35:5
    |
 LL |     z.1; //~ ERROR: field `1` of struct `inner::Z` is private
    |     ^^^
diff --git a/src/test/ui/structs/struct-fields-decl-dupe.rs b/src/test/ui/structs/struct-fields-decl-dupe.rs
index 1f6b070d837..6ddf3d976b7 100644
--- a/src/test/ui/structs/struct-fields-decl-dupe.rs
+++ b/src/test/ui/structs/struct-fields-decl-dupe.rs
@@ -1,13 +1,3 @@
-// Copyright 2013 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.
-
 struct BuildData {
     foo: isize,
     foo: isize,
diff --git a/src/test/ui/structs/struct-fields-decl-dupe.stderr b/src/test/ui/structs/struct-fields-decl-dupe.stderr
index b5068b4abda..d7ce9bb8922 100644
--- a/src/test/ui/structs/struct-fields-decl-dupe.stderr
+++ b/src/test/ui/structs/struct-fields-decl-dupe.stderr
@@ -1,5 +1,5 @@
 error[E0124]: field `foo` is already declared
-  --> $DIR/struct-fields-decl-dupe.rs:13:5
+  --> $DIR/struct-fields-decl-dupe.rs:3:5
    |
 LL |     foo: isize,
    |     ---------- `foo` first declared here
diff --git a/src/test/ui/structs/struct-fields-dupe.rs b/src/test/ui/structs/struct-fields-dupe.rs
index 578091f5e9a..2fa25a33545 100644
--- a/src/test/ui/structs/struct-fields-dupe.rs
+++ b/src/test/ui/structs/struct-fields-dupe.rs
@@ -1,13 +1,3 @@
-// Copyright 2012 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.
-
 struct BuildData {
     foo: isize,
 }
diff --git a/src/test/ui/structs/struct-fields-dupe.stderr b/src/test/ui/structs/struct-fields-dupe.stderr
index fa2079317e0..7739ef80fc8 100644
--- a/src/test/ui/structs/struct-fields-dupe.stderr
+++ b/src/test/ui/structs/struct-fields-dupe.stderr
@@ -1,5 +1,5 @@
 error[E0062]: field `foo` specified more than once
-  --> $DIR/struct-fields-dupe.rs:18:9
+  --> $DIR/struct-fields-dupe.rs:8:9
    |
 LL |         foo: 0,
    |         ------ first use of `foo`
diff --git a/src/test/ui/structs/struct-fields-hints-no-dupe.rs b/src/test/ui/structs/struct-fields-hints-no-dupe.rs
index e4366cf79b1..987cf726fec 100644
--- a/src/test/ui/structs/struct-fields-hints-no-dupe.rs
+++ b/src/test/ui/structs/struct-fields-hints-no-dupe.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.
-
 struct A {
     foo : i32,
     car : i32,
diff --git a/src/test/ui/structs/struct-fields-hints-no-dupe.stderr b/src/test/ui/structs/struct-fields-hints-no-dupe.stderr
index d04d193c665..105f330463a 100644
--- a/src/test/ui/structs/struct-fields-hints-no-dupe.stderr
+++ b/src/test/ui/structs/struct-fields-hints-no-dupe.stderr
@@ -1,5 +1,5 @@
 error[E0560]: struct `A` has no field named `bar`
-  --> $DIR/struct-fields-hints-no-dupe.rs:20:9
+  --> $DIR/struct-fields-hints-no-dupe.rs:10:9
    |
 LL |         bar : 42,
    |         ^^^ field does not exist - did you mean `barr`?
diff --git a/src/test/ui/structs/struct-fields-hints.rs b/src/test/ui/structs/struct-fields-hints.rs
index 85dc1aedb44..08df0930e4d 100644
--- a/src/test/ui/structs/struct-fields-hints.rs
+++ b/src/test/ui/structs/struct-fields-hints.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.
-
 struct A {
     foo : i32,
     car : i32,
diff --git a/src/test/ui/structs/struct-fields-hints.stderr b/src/test/ui/structs/struct-fields-hints.stderr
index 6d0ec8bdf92..d7130305631 100644
--- a/src/test/ui/structs/struct-fields-hints.stderr
+++ b/src/test/ui/structs/struct-fields-hints.stderr
@@ -1,5 +1,5 @@
 error[E0560]: struct `A` has no field named `bar`
-  --> $DIR/struct-fields-hints.rs:20:9
+  --> $DIR/struct-fields-hints.rs:10:9
    |
 LL |         bar : 42,
    |         ^^^ field does not exist - did you mean `car`?
diff --git a/src/test/ui/structs/struct-fields-missing.rs b/src/test/ui/structs/struct-fields-missing.rs
index d5ab13affaf..0c7919d0249 100644
--- a/src/test/ui/structs/struct-fields-missing.rs
+++ b/src/test/ui/structs/struct-fields-missing.rs
@@ -1,14 +1,3 @@
-// Copyright 2012 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.
-
-
 struct BuildData {
     foo: isize,
     bar: Box<isize>,
diff --git a/src/test/ui/structs/struct-fields-missing.stderr b/src/test/ui/structs/struct-fields-missing.stderr
index 606288ef277..edbac000dea 100644
--- a/src/test/ui/structs/struct-fields-missing.stderr
+++ b/src/test/ui/structs/struct-fields-missing.stderr
@@ -1,5 +1,5 @@
 error[E0063]: missing field `bar` in initializer of `BuildData`
-  --> $DIR/struct-fields-missing.rs:18:15
+  --> $DIR/struct-fields-missing.rs:7:15
    |
 LL |     let foo = BuildData { //~ ERROR missing field `bar` in initializer of `BuildData`
    |               ^^^^^^^^^ missing `bar`
diff --git a/src/test/ui/structs/struct-fields-shorthand-unresolved.rs b/src/test/ui/structs/struct-fields-shorthand-unresolved.rs
index 984f337fb3d..caad149160c 100644
--- a/src/test/ui/structs/struct-fields-shorthand-unresolved.rs
+++ b/src/test/ui/structs/struct-fields-shorthand-unresolved.rs
@@ -1,13 +1,3 @@
-// Copyright 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.
-
 struct Foo {
     x: i32,
     y: i32
diff --git a/src/test/ui/structs/struct-fields-shorthand-unresolved.stderr b/src/test/ui/structs/struct-fields-shorthand-unresolved.stderr
index f66ac96e0b7..0fcaac55fd6 100644
--- a/src/test/ui/structs/struct-fields-shorthand-unresolved.stderr
+++ b/src/test/ui/structs/struct-fields-shorthand-unresolved.stderr
@@ -1,5 +1,5 @@
 error[E0425]: cannot find value `y` in this scope
-  --> $DIR/struct-fields-shorthand-unresolved.rs:20:9
+  --> $DIR/struct-fields-shorthand-unresolved.rs:10:9
    |
 LL |         y //~ ERROR cannot find value `y` in this scope
    |         ^ did you mean `x`?
diff --git a/src/test/ui/structs/struct-fields-shorthand.rs b/src/test/ui/structs/struct-fields-shorthand.rs
index e46ae73f1a1..45e3014f22e 100644
--- a/src/test/ui/structs/struct-fields-shorthand.rs
+++ b/src/test/ui/structs/struct-fields-shorthand.rs
@@ -1,13 +1,3 @@
-// Copyright 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.
-
 struct Foo {
     x: i32,
     y: i32
diff --git a/src/test/ui/structs/struct-fields-shorthand.stderr b/src/test/ui/structs/struct-fields-shorthand.stderr
index a65a9c86581..0d3d633f61c 100644
--- a/src/test/ui/structs/struct-fields-shorthand.stderr
+++ b/src/test/ui/structs/struct-fields-shorthand.stderr
@@ -1,5 +1,5 @@
 error[E0560]: struct `Foo` has no field named `z`
-  --> $DIR/struct-fields-shorthand.rs:19:15
+  --> $DIR/struct-fields-shorthand.rs:9:15
    |
 LL |         x, y, z //~ ERROR struct `Foo` has no field named `z`
    |               ^ `Foo` does not have this field
diff --git a/src/test/ui/structs/struct-fields-too-many.rs b/src/test/ui/structs/struct-fields-too-many.rs
index 1e0b8efc96f..8be8dcbf13c 100644
--- a/src/test/ui/structs/struct-fields-too-many.rs
+++ b/src/test/ui/structs/struct-fields-too-many.rs
@@ -1,13 +1,3 @@
-// Copyright 2012 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.
-
 struct BuildData {
     foo: isize,
 }
diff --git a/src/test/ui/structs/struct-fields-too-many.stderr b/src/test/ui/structs/struct-fields-too-many.stderr
index 01b3fe16fbb..a1b7a7a3110 100644
--- a/src/test/ui/structs/struct-fields-too-many.stderr
+++ b/src/test/ui/structs/struct-fields-too-many.stderr
@@ -1,5 +1,5 @@
 error[E0560]: struct `BuildData` has no field named `bar`
-  --> $DIR/struct-fields-too-many.rs:18:9
+  --> $DIR/struct-fields-too-many.rs:8:9
    |
 LL |         bar: 0
    |         ^^^ `BuildData` does not have this field
diff --git a/src/test/ui/structs/struct-fields-typo.rs b/src/test/ui/structs/struct-fields-typo.rs
index 0e30c1e86e4..b435a0a4777 100644
--- a/src/test/ui/structs/struct-fields-typo.rs
+++ b/src/test/ui/structs/struct-fields-typo.rs
@@ -1,13 +1,3 @@
-// Copyright 2012 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.
-
 struct BuildData {
     foo: isize,
     bar: f32
diff --git a/src/test/ui/structs/struct-fields-typo.stderr b/src/test/ui/structs/struct-fields-typo.stderr
index 9f2f97a6c09..93127ab5beb 100644
--- a/src/test/ui/structs/struct-fields-typo.stderr
+++ b/src/test/ui/structs/struct-fields-typo.stderr
@@ -1,5 +1,5 @@
 error[E0609]: no field `baa` on type `BuildData`
-  --> $DIR/struct-fields-typo.rs:21:17
+  --> $DIR/struct-fields-typo.rs:11:17
    |
 LL |     let x = foo.baa;//~ no field `baa` on type `BuildData`
    |                 ^^^ did you mean `bar`?
diff --git a/src/test/ui/structs/struct-like-enum-nonexhaustive.rs b/src/test/ui/structs/struct-like-enum-nonexhaustive.rs
index a14e43f4c94..b1fc0f5ad3e 100644
--- a/src/test/ui/structs/struct-like-enum-nonexhaustive.rs
+++ b/src/test/ui/structs/struct-like-enum-nonexhaustive.rs
@@ -1,13 +1,3 @@
-// Copyright 2012 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.
-
 enum A {
     B { x: Option<isize> },
     C
diff --git a/src/test/ui/structs/struct-like-enum-nonexhaustive.stderr b/src/test/ui/structs/struct-like-enum-nonexhaustive.stderr
index 56dbf0c93ba..d651ea0b4e2 100644
--- a/src/test/ui/structs/struct-like-enum-nonexhaustive.stderr
+++ b/src/test/ui/structs/struct-like-enum-nonexhaustive.stderr
@@ -1,5 +1,5 @@
 error[E0004]: non-exhaustive patterns: `B { x: Some(_) }` not covered
-  --> $DIR/struct-like-enum-nonexhaustive.rs:18:11
+  --> $DIR/struct-like-enum-nonexhaustive.rs:8:11
    |
 LL |     match x {   //~ ERROR non-exhaustive patterns
    |           ^ pattern `B { x: Some(_) }` not covered
diff --git a/src/test/ui/structs/struct-missing-comma.rs b/src/test/ui/structs/struct-missing-comma.rs
index 87ae8ab2605..e07080f609f 100644
--- a/src/test/ui/structs/struct-missing-comma.rs
+++ b/src/test/ui/structs/struct-missing-comma.rs
@@ -1,13 +1,3 @@
-// Copyright 2018 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.
-
 // compile-flags: -Z parse-only
 
 // Issue #50636
diff --git a/src/test/ui/structs/struct-missing-comma.stderr b/src/test/ui/structs/struct-missing-comma.stderr
index 28283bfb713..a941c5bf1ab 100644
--- a/src/test/ui/structs/struct-missing-comma.stderr
+++ b/src/test/ui/structs/struct-missing-comma.stderr
@@ -1,5 +1,5 @@
 error: expected `,`, or `}`, found `bar`
-  --> $DIR/struct-missing-comma.rs:16:13
+  --> $DIR/struct-missing-comma.rs:6:13
    |
 LL |     foo: u32 //~ expected `,`, or `}`, found `bar`
    |             ^ help: try adding a comma: `,`
diff --git a/src/test/ui/structs/struct-pat-derived-error.rs b/src/test/ui/structs/struct-pat-derived-error.rs
index eca87b285b9..f49a8ff8bdd 100644
--- a/src/test/ui/structs/struct-pat-derived-error.rs
+++ b/src/test/ui/structs/struct-pat-derived-error.rs
@@ -1,13 +1,3 @@
-// Copyright 2013 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.
-
 struct A {
     b: usize,
     c: usize
diff --git a/src/test/ui/structs/struct-pat-derived-error.stderr b/src/test/ui/structs/struct-pat-derived-error.stderr
index 5b7ce4ed763..dd1dc71f7fd 100644
--- a/src/test/ui/structs/struct-pat-derived-error.stderr
+++ b/src/test/ui/structs/struct-pat-derived-error.stderr
@@ -1,17 +1,17 @@
 error[E0609]: no field `d` on type `&A`
-  --> $DIR/struct-pat-derived-error.rs:18:31
+  --> $DIR/struct-pat-derived-error.rs:8:31
    |
 LL |         let A { x, y } = self.d; //~ ERROR no field `d` on type `&A`
    |                               ^
 
 error[E0026]: struct `A` does not have fields named `x`, `y`
-  --> $DIR/struct-pat-derived-error.rs:18:17
+  --> $DIR/struct-pat-derived-error.rs:8:17
    |
 LL |         let A { x, y } = self.d; //~ ERROR no field `d` on type `&A`
    |                 ^  ^ struct `A` does not have these fields
 
 error[E0027]: pattern does not mention fields `b`, `c`
-  --> $DIR/struct-pat-derived-error.rs:18:13
+  --> $DIR/struct-pat-derived-error.rs:8:13
    |
 LL |         let A { x, y } = self.d; //~ ERROR no field `d` on type `&A`
    |             ^^^^^^^^^^ missing fields `b`, `c`
diff --git a/src/test/ui/structs/struct-path-alias-bounds.rs b/src/test/ui/structs/struct-path-alias-bounds.rs
index 1b6e51e3703..ae6ca808269 100644
--- a/src/test/ui/structs/struct-path-alias-bounds.rs
+++ b/src/test/ui/structs/struct-path-alias-bounds.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 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.
-
 // issue #36286
 
 struct S<T: Clone> { a: T }
diff --git a/src/test/ui/structs/struct-path-alias-bounds.stderr b/src/test/ui/structs/struct-path-alias-bounds.stderr
index f8e2fe1410f..70eb2610ea5 100644
--- a/src/test/ui/structs/struct-path-alias-bounds.stderr
+++ b/src/test/ui/structs/struct-path-alias-bounds.stderr
@@ -1,11 +1,11 @@
 error[E0277]: the trait bound `NoClone: std::clone::Clone` is not satisfied
-  --> $DIR/struct-path-alias-bounds.rs:19:13
+  --> $DIR/struct-path-alias-bounds.rs:9:13
    |
 LL |     let s = A { a: NoClone };
    |             ^ the trait `std::clone::Clone` is not implemented for `NoClone`
    |
 note: required by `S`
-  --> $DIR/struct-path-alias-bounds.rs:13:1
+  --> $DIR/struct-path-alias-bounds.rs:3:1
    |
 LL | struct S<T: Clone> { a: T }
    | ^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/structs/struct-path-associated-type.rs b/src/test/ui/structs/struct-path-associated-type.rs
index 660ac44ce0b..1cafe265b2e 100644
--- a/src/test/ui/structs/struct-path-associated-type.rs
+++ b/src/test/ui/structs/struct-path-associated-type.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 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.
-
 struct S;
 
 trait Tr {
diff --git a/src/test/ui/structs/struct-path-associated-type.stderr b/src/test/ui/structs/struct-path-associated-type.stderr
index 873e7bb7b83..41360d87930 100644
--- a/src/test/ui/structs/struct-path-associated-type.stderr
+++ b/src/test/ui/structs/struct-path-associated-type.stderr
@@ -1,53 +1,53 @@
 error[E0071]: expected struct, variant or union type, found associated type
-  --> $DIR/struct-path-associated-type.rs:22:13
+  --> $DIR/struct-path-associated-type.rs:12:13
    |
 LL |     let s = T::A {};
    |             ^^^^ not a struct
 
 error[E0109]: type parameters are not allowed on this type
-  --> $DIR/struct-path-associated-type.rs:24:20
+  --> $DIR/struct-path-associated-type.rs:14:20
    |
 LL |     let z = T::A::<u8> {};
    |                    ^^ type parameter not allowed
 
 error[E0071]: expected struct, variant or union type, found associated type
-  --> $DIR/struct-path-associated-type.rs:24:13
+  --> $DIR/struct-path-associated-type.rs:14:13
    |
 LL |     let z = T::A::<u8> {};
    |             ^^^^^^^^^^ not a struct
 
 error[E0071]: expected struct, variant or union type, found associated type
-  --> $DIR/struct-path-associated-type.rs:28:9
+  --> $DIR/struct-path-associated-type.rs:18:9
    |
 LL |         T::A {} => {}
    |         ^^^^ not a struct
 
 error[E0109]: type parameters are not allowed on this type
-  --> $DIR/struct-path-associated-type.rs:35:20
+  --> $DIR/struct-path-associated-type.rs:25:20
    |
 LL |     let z = T::A::<u8> {}; //~ ERROR type parameters are not allowed on this type
    |                    ^^ type parameter not allowed
 
 error[E0223]: ambiguous associated type
-  --> $DIR/struct-path-associated-type.rs:42:13
+  --> $DIR/struct-path-associated-type.rs:32:13
    |
 LL |     let s = S::A {}; //~ ERROR ambiguous associated type
    |             ^^^^ help: use fully-qualified syntax: `<S as Trait>::A`
 
 error[E0109]: type parameters are not allowed on this type
-  --> $DIR/struct-path-associated-type.rs:43:20
+  --> $DIR/struct-path-associated-type.rs:33:20
    |
 LL |     let z = S::A::<u8> {}; //~ ERROR ambiguous associated type
    |                    ^^ type parameter not allowed
 
 error[E0223]: ambiguous associated type
-  --> $DIR/struct-path-associated-type.rs:43:13
+  --> $DIR/struct-path-associated-type.rs:33:13
    |
 LL |     let z = S::A::<u8> {}; //~ ERROR ambiguous associated type
    |             ^^^^^^^^^^ help: use fully-qualified syntax: `<S as Trait>::A`
 
 error[E0223]: ambiguous associated type
-  --> $DIR/struct-path-associated-type.rs:46:9
+  --> $DIR/struct-path-associated-type.rs:36:9
    |
 LL |         S::A {} => {} //~ ERROR ambiguous associated type
    |         ^^^^ help: use fully-qualified syntax: `<S as Trait>::A`
diff --git a/src/test/ui/structs/struct-path-self-type-mismatch.rs b/src/test/ui/structs/struct-path-self-type-mismatch.rs
index e966ea65902..c0c557ecace 100644
--- a/src/test/ui/structs/struct-path-self-type-mismatch.rs
+++ b/src/test/ui/structs/struct-path-self-type-mismatch.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 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.
-
 struct Foo<A> { inner: A }
 
 trait Bar { fn bar(); }
diff --git a/src/test/ui/structs/struct-path-self-type-mismatch.stderr b/src/test/ui/structs/struct-path-self-type-mismatch.stderr
index cfba3be6130..0b1b1e83400 100644
--- a/src/test/ui/structs/struct-path-self-type-mismatch.stderr
+++ b/src/test/ui/structs/struct-path-self-type-mismatch.stderr
@@ -1,11 +1,11 @@
 error[E0308]: mismatched types
-  --> $DIR/struct-path-self-type-mismatch.rs:17:23
+  --> $DIR/struct-path-self-type-mismatch.rs:7:23
    |
 LL |         Self { inner: 1.5f32 }; //~ ERROR mismatched types
    |                       ^^^^^^ expected i32, found f32
 
 error[E0308]: mismatched types
-  --> $DIR/struct-path-self-type-mismatch.rs:25:20
+  --> $DIR/struct-path-self-type-mismatch.rs:15:20
    |
 LL |             inner: u
    |                    ^ expected type parameter, found a different type parameter
@@ -14,7 +14,7 @@ LL |             inner: u
               found type `U`
 
 error[E0308]: mismatched types
-  --> $DIR/struct-path-self-type-mismatch.rs:23:9
+  --> $DIR/struct-path-self-type-mismatch.rs:13:9
    |
 LL |       fn new<U>(u: U) -> Foo<U> {
    |                          ------ expected `Foo<U>` because of return type
diff --git a/src/test/ui/structs/struct-path-self.rs b/src/test/ui/structs/struct-path-self.rs
index 067d6ac22dc..ccbf3db29b1 100644
--- a/src/test/ui/structs/struct-path-self.rs
+++ b/src/test/ui/structs/struct-path-self.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 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.
-
 struct S;
 
 trait Tr {
diff --git a/src/test/ui/structs/struct-path-self.stderr b/src/test/ui/structs/struct-path-self.stderr
index 1b5506072e8..a1df1a0764c 100644
--- a/src/test/ui/structs/struct-path-self.stderr
+++ b/src/test/ui/structs/struct-path-self.stderr
@@ -1,35 +1,35 @@
 error[E0071]: expected struct, variant or union type, found Self
-  --> $DIR/struct-path-self.rs:15:17
+  --> $DIR/struct-path-self.rs:5:17
    |
 LL |         let s = Self {};
    |                 ^^^^ not a struct
 
 error[E0109]: type parameters are not allowed on this type
-  --> $DIR/struct-path-self.rs:17:24
+  --> $DIR/struct-path-self.rs:7:24
    |
 LL |         let z = Self::<u8> {};
    |                        ^^ type parameter not allowed
 
 error[E0071]: expected struct, variant or union type, found Self
-  --> $DIR/struct-path-self.rs:17:17
+  --> $DIR/struct-path-self.rs:7:17
    |
 LL |         let z = Self::<u8> {};
    |                 ^^^^^^^^^^ not a struct
 
 error[E0071]: expected struct, variant or union type, found Self
-  --> $DIR/struct-path-self.rs:21:13
+  --> $DIR/struct-path-self.rs:11:13
    |
 LL |             Self { .. } => {}
    |             ^^^^ not a struct
 
 error[E0109]: type parameters are not allowed on this type
-  --> $DIR/struct-path-self.rs:30:24
+  --> $DIR/struct-path-self.rs:20:24
    |
 LL |         let z = Self::<u8> {}; //~ ERROR type parameters are not allowed on this type
    |                        ^^ type parameter not allowed
 
 error[E0109]: type parameters are not allowed on this type
-  --> $DIR/struct-path-self.rs:40:24
+  --> $DIR/struct-path-self.rs:30:24
    |
 LL |         let z = Self::<u8> {}; //~ ERROR type parameters are not allowed on this type
    |                        ^^ type parameter not allowed
diff --git a/src/test/ui/structs/struct-pattern-match-useless.rs b/src/test/ui/structs/struct-pattern-match-useless.rs
index dda30141b4a..93f0a931761 100644
--- a/src/test/ui/structs/struct-pattern-match-useless.rs
+++ b/src/test/ui/structs/struct-pattern-match-useless.rs
@@ -1,13 +1,3 @@
-// Copyright 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.
-
 #![deny(unreachable_patterns)]
 
 struct Foo {
diff --git a/src/test/ui/structs/struct-pattern-match-useless.stderr b/src/test/ui/structs/struct-pattern-match-useless.stderr
index 60f17d1d906..561964bcb24 100644
--- a/src/test/ui/structs/struct-pattern-match-useless.stderr
+++ b/src/test/ui/structs/struct-pattern-match-useless.stderr
@@ -1,11 +1,11 @@
 error: unreachable pattern
-  --> $DIR/struct-pattern-match-useless.rs:22:9
+  --> $DIR/struct-pattern-match-useless.rs:12:9
    |
 LL |         Foo { .. } => () //~ ERROR unreachable pattern
    |         ^^^^^^^^^^
    |
 note: lint level defined here
-  --> $DIR/struct-pattern-match-useless.rs:11:9
+  --> $DIR/struct-pattern-match-useless.rs:1:9
    |
 LL | #![deny(unreachable_patterns)]
    |         ^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/structs/struct-variant-privacy-xc.rs b/src/test/ui/structs/struct-variant-privacy-xc.rs
index 8507acd26ce..10e9639096f 100644
--- a/src/test/ui/structs/struct-variant-privacy-xc.rs
+++ b/src/test/ui/structs/struct-variant-privacy-xc.rs
@@ -1,13 +1,3 @@
-// Copyright 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.
-
 // aux-build:struct_variant_privacy.rs
 extern crate struct_variant_privacy;
 
diff --git a/src/test/ui/structs/struct-variant-privacy-xc.stderr b/src/test/ui/structs/struct-variant-privacy-xc.stderr
index 7c214f9dcea..da61fc83c26 100644
--- a/src/test/ui/structs/struct-variant-privacy-xc.stderr
+++ b/src/test/ui/structs/struct-variant-privacy-xc.stderr
@@ -1,11 +1,11 @@
 error[E0603]: enum `Bar` is private
-  --> $DIR/struct-variant-privacy-xc.rs:14:33
+  --> $DIR/struct-variant-privacy-xc.rs:4:33
    |
 LL | fn f(b: struct_variant_privacy::Bar) { //~ ERROR enum `Bar` is private
    |                                 ^^^
 
 error[E0603]: enum `Bar` is private
-  --> $DIR/struct-variant-privacy-xc.rs:16:33
+  --> $DIR/struct-variant-privacy-xc.rs:6:33
    |
 LL |         struct_variant_privacy::Bar::Baz { a: _a } => {} //~ ERROR enum `Bar` is private
    |                                 ^^^
diff --git a/src/test/ui/structs/struct-variant-privacy.rs b/src/test/ui/structs/struct-variant-privacy.rs
index 7de4ca62555..8355879e7d9 100644
--- a/src/test/ui/structs/struct-variant-privacy.rs
+++ b/src/test/ui/structs/struct-variant-privacy.rs
@@ -1,12 +1,3 @@
-// Copyright 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.
 mod foo {
     enum Bar {
         Baz { a: isize }
diff --git a/src/test/ui/structs/struct-variant-privacy.stderr b/src/test/ui/structs/struct-variant-privacy.stderr
index ffecd880069..0895b52998c 100644
--- a/src/test/ui/structs/struct-variant-privacy.stderr
+++ b/src/test/ui/structs/struct-variant-privacy.stderr
@@ -1,11 +1,11 @@
 error[E0603]: enum `Bar` is private
-  --> $DIR/struct-variant-privacy.rs:16:14
+  --> $DIR/struct-variant-privacy.rs:7:14
    |
 LL | fn f(b: foo::Bar) { //~ ERROR enum `Bar` is private
    |              ^^^
 
 error[E0603]: enum `Bar` is private
-  --> $DIR/struct-variant-privacy.rs:18:14
+  --> $DIR/struct-variant-privacy.rs:9:14
    |
 LL |         foo::Bar::Baz { a: _a } => {} //~ ERROR enum `Bar` is private
    |              ^^^
diff --git a/src/test/ui/structs/structure-constructor-type-mismatch.rs b/src/test/ui/structs/structure-constructor-type-mismatch.rs
index 87fc5ba93ae..54319e1ea4f 100644
--- a/src/test/ui/structs/structure-constructor-type-mismatch.rs
+++ b/src/test/ui/structs/structure-constructor-type-mismatch.rs
@@ -1,13 +1,3 @@
-// Copyright 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.
-
 struct Point<T> {
     x: T,
     y: T,
diff --git a/src/test/ui/structs/structure-constructor-type-mismatch.stderr b/src/test/ui/structs/structure-constructor-type-mismatch.stderr
index 97a64bf3b55..6abc75110e1 100644
--- a/src/test/ui/structs/structure-constructor-type-mismatch.stderr
+++ b/src/test/ui/structs/structure-constructor-type-mismatch.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/structure-constructor-type-mismatch.rs:27:12
+  --> $DIR/structure-constructor-type-mismatch.rs:17:12
    |
 LL |         x: 1,
    |            ^
@@ -11,7 +11,7 @@ LL |         x: 1,
               found type `{integer}`
 
 error[E0308]: mismatched types
-  --> $DIR/structure-constructor-type-mismatch.rs:30:12
+  --> $DIR/structure-constructor-type-mismatch.rs:20:12
    |
 LL |         y: 2,
    |            ^
@@ -23,7 +23,7 @@ LL |         y: 2,
               found type `{integer}`
 
 error[E0308]: mismatched types
-  --> $DIR/structure-constructor-type-mismatch.rs:36:12
+  --> $DIR/structure-constructor-type-mismatch.rs:26:12
    |
 LL |         x: 3,
    |            ^
@@ -35,7 +35,7 @@ LL |         x: 3,
               found type `{integer}`
 
 error[E0308]: mismatched types
-  --> $DIR/structure-constructor-type-mismatch.rs:39:12
+  --> $DIR/structure-constructor-type-mismatch.rs:29:12
    |
 LL |         y: 4,
    |            ^
@@ -47,7 +47,7 @@ LL |         y: 4,
               found type `{integer}`
 
 error[E0308]: mismatched types
-  --> $DIR/structure-constructor-type-mismatch.rs:45:12
+  --> $DIR/structure-constructor-type-mismatch.rs:35:12
    |
 LL |         x: 5,
    |            ^
@@ -59,7 +59,7 @@ LL |         x: 5,
               found type `{integer}`
 
 error[E0308]: mismatched types
-  --> $DIR/structure-constructor-type-mismatch.rs:52:12
+  --> $DIR/structure-constructor-type-mismatch.rs:42:12
    |
 LL |         x: 7,
    |            ^
@@ -71,13 +71,13 @@ LL |         x: 7,
               found type `{integer}`
 
 error[E0107]: wrong number of type arguments: expected 0, found 1
-  --> $DIR/structure-constructor-type-mismatch.rs:58:24
+  --> $DIR/structure-constructor-type-mismatch.rs:48:24
    |
 LL |     let pt3 = PointF::<i32> { //~ ERROR wrong number of type arguments
    |                        ^^^ unexpected type argument
 
 error[E0308]: mismatched types
-  --> $DIR/structure-constructor-type-mismatch.rs:59:12
+  --> $DIR/structure-constructor-type-mismatch.rs:49:12
    |
 LL |         x: 9,  //~ ERROR mismatched types
    |            ^
@@ -89,7 +89,7 @@ LL |         x: 9,  //~ ERROR mismatched types
               found type `{integer}`
 
 error[E0308]: mismatched types
-  --> $DIR/structure-constructor-type-mismatch.rs:60:12
+  --> $DIR/structure-constructor-type-mismatch.rs:50:12
    |
 LL |         y: 10, //~ ERROR mismatched types
    |            ^^
@@ -101,13 +101,13 @@ LL |         y: 10, //~ ERROR mismatched types
               found type `{integer}`
 
 error[E0107]: wrong number of type arguments: expected 0, found 1
-  --> $DIR/structure-constructor-type-mismatch.rs:64:18
+  --> $DIR/structure-constructor-type-mismatch.rs:54:18
    |
 LL |         PointF::<u32> { .. } => {} //~ ERROR wrong number of type arguments
    |                  ^^^ unexpected type argument
 
 error[E0308]: mismatched types
-  --> $DIR/structure-constructor-type-mismatch.rs:64:9
+  --> $DIR/structure-constructor-type-mismatch.rs:54:9
    |
 LL |         PointF::<u32> { .. } => {} //~ ERROR wrong number of type arguments
    |         ^^^^^^^^^^^^^^^^^^^^ expected integral variable, found f32
@@ -116,7 +116,7 @@ LL |         PointF::<u32> { .. } => {} //~ ERROR wrong number of type arguments
               found type `Point<f32>`
 
 error[E0308]: mismatched types
-  --> $DIR/structure-constructor-type-mismatch.rs:69:9
+  --> $DIR/structure-constructor-type-mismatch.rs:59:9
    |
 LL |         PointF { .. } => {} //~ ERROR mismatched types
    |         ^^^^^^^^^^^^^ expected integral variable, found f32
@@ -125,7 +125,7 @@ LL |         PointF { .. } => {} //~ ERROR mismatched types
               found type `Point<f32>`
 
 error[E0308]: mismatched types
-  --> $DIR/structure-constructor-type-mismatch.rs:77:9
+  --> $DIR/structure-constructor-type-mismatch.rs:67:9
    |
 LL |         PairF::<u32> { .. } => {} //~ ERROR mismatched types
    |         ^^^^^^^^^^^^^^^^^^^ expected integral variable, found f32