about summary refs log tree commit diff
path: root/src/test/ui/missing
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-12-26 16:16:02 +0000
committerbors <bors@rust-lang.org>2018-12-26 16:16:02 +0000
commit79d8a0fcefa5134db2a94739b1d18daa01fc6e9f (patch)
tree9937976e72116b7deb2035e6a251472168f1ad64 /src/test/ui/missing
parent14b96659e4e9b2f31431df48f47c219957e2666a (diff)
parente132d9066dd1d7acede428438ba8a32345ac343f (diff)
downloadrust-79d8a0fcefa5134db2a94739b1d18daa01fc6e9f.tar.gz
rust-79d8a0fcefa5134db2a94739b1d18daa01fc6e9f.zip
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
Diffstat (limited to 'src/test/ui/missing')
-rw-r--r--src/test/ui/missing/auxiliary/two_macros.rs10
-rw-r--r--src/test/ui/missing/missing-alloc_error_handler.rs10
-rw-r--r--src/test/ui/missing/missing-allocator.rs10
-rw-r--r--src/test/ui/missing/missing-block-hint.rs10
-rw-r--r--src/test/ui/missing/missing-block-hint.stderr4
-rw-r--r--src/test/ui/missing/missing-comma-in-match.fixed10
-rw-r--r--src/test/ui/missing/missing-comma-in-match.rs10
-rw-r--r--src/test/ui/missing/missing-comma-in-match.stderr2
-rw-r--r--src/test/ui/missing/missing-derivable-attr.rs10
-rw-r--r--src/test/ui/missing/missing-derivable-attr.stderr2
-rw-r--r--src/test/ui/missing/missing-fields-in-struct-pattern.rs10
-rw-r--r--src/test/ui/missing/missing-fields-in-struct-pattern.stderr4
-rw-r--r--src/test/ui/missing/missing-items/auxiliary/m1.rs11
-rw-r--r--src/test/ui/missing/missing-items/issue-40221.rs10
-rw-r--r--src/test/ui/missing/missing-items/issue-40221.stderr2
-rw-r--r--src/test/ui/missing/missing-items/m2.rs10
-rw-r--r--src/test/ui/missing/missing-items/m2.stderr2
-rw-r--r--src/test/ui/missing/missing-items/missing-type-parameter.rs10
-rw-r--r--src/test/ui/missing/missing-items/missing-type-parameter.stderr2
-rw-r--r--src/test/ui/missing/missing-macro-use.rs10
-rw-r--r--src/test/ui/missing/missing-macro-use.stderr2
-rw-r--r--src/test/ui/missing/missing-main.rs10
-rw-r--r--src/test/ui/missing/missing-return.rs10
-rw-r--r--src/test/ui/missing/missing-return.stderr2
-rw-r--r--src/test/ui/missing/missing-semicolon-warning.rs10
-rw-r--r--src/test/ui/missing/missing-semicolon-warning.stderr4
-rw-r--r--src/test/ui/missing/missing-stability.rs10
-rw-r--r--src/test/ui/missing/missing-stability.stderr4
28 files changed, 15 insertions, 186 deletions
diff --git a/src/test/ui/missing/auxiliary/two_macros.rs b/src/test/ui/missing/auxiliary/two_macros.rs
index 060960f0dbc..2330c75c8e0 100644
--- a/src/test/ui/missing/auxiliary/two_macros.rs
+++ b/src/test/ui/missing/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/missing/missing-alloc_error_handler.rs b/src/test/ui/missing/missing-alloc_error_handler.rs
index 1096027c8dc..1a9e8688e8a 100644
--- a/src/test/ui/missing/missing-alloc_error_handler.rs
+++ b/src/test/ui/missing/missing-alloc_error_handler.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.
-
 // compile-flags: -C panic=abort
 // no-prefer-dynamic
 
diff --git a/src/test/ui/missing/missing-allocator.rs b/src/test/ui/missing/missing-allocator.rs
index f4331c4b994..dbb10d1e7b9 100644
--- a/src/test/ui/missing/missing-allocator.rs
+++ b/src/test/ui/missing/missing-allocator.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.
-
 // compile-flags: -C panic=abort
 // no-prefer-dynamic
 
diff --git a/src/test/ui/missing/missing-block-hint.rs b/src/test/ui/missing/missing-block-hint.rs
index 777ff5b9b26..89db02a9cba 100644
--- a/src/test/ui/missing/missing-block-hint.rs
+++ b/src/test/ui/missing/missing-block-hint.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.
-
 fn main() {
     {
         if (foo) => {} //~ ERROR expected `{`, found `=>`
diff --git a/src/test/ui/missing/missing-block-hint.stderr b/src/test/ui/missing/missing-block-hint.stderr
index dbbfd10b795..576a6268a99 100644
--- a/src/test/ui/missing/missing-block-hint.stderr
+++ b/src/test/ui/missing/missing-block-hint.stderr
@@ -1,5 +1,5 @@
 error: expected `{`, found `=>`
-  --> $DIR/missing-block-hint.rs:13:18
+  --> $DIR/missing-block-hint.rs:3:18
    |
 LL |         if (foo) => {} //~ ERROR expected `{`, found `=>`
    |         --       ^^ expected `{`
@@ -7,7 +7,7 @@ LL |         if (foo) => {} //~ ERROR expected `{`, found `=>`
    |         this `if` statement has a condition, but no block
 
 error: expected `{`, found `bar`
-  --> $DIR/missing-block-hint.rs:17:13
+  --> $DIR/missing-block-hint.rs:7:13
    |
 LL |         if (foo)
    |         -- this `if` statement has a condition, but no block
diff --git a/src/test/ui/missing/missing-comma-in-match.fixed b/src/test/ui/missing/missing-comma-in-match.fixed
index 4832f35f42d..de1b9506af9 100644
--- a/src/test/ui/missing/missing-comma-in-match.fixed
+++ b/src/test/ui/missing/missing-comma-in-match.fixed
@@ -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.
-
 // run-rustfix
 
 fn main() {
diff --git a/src/test/ui/missing/missing-comma-in-match.rs b/src/test/ui/missing/missing-comma-in-match.rs
index e39b20e77ea..d7d16155cf2 100644
--- a/src/test/ui/missing/missing-comma-in-match.rs
+++ b/src/test/ui/missing/missing-comma-in-match.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.
-
 // run-rustfix
 
 fn main() {
diff --git a/src/test/ui/missing/missing-comma-in-match.stderr b/src/test/ui/missing/missing-comma-in-match.stderr
index 77935934107..ae46516f8d1 100644
--- a/src/test/ui/missing/missing-comma-in-match.stderr
+++ b/src/test/ui/missing/missing-comma-in-match.stderr
@@ -1,5 +1,5 @@
 error: expected one of `,`, `.`, `?`, `}`, or an operator, found `=>`
-  --> $DIR/missing-comma-in-match.rs:16:18
+  --> $DIR/missing-comma-in-match.rs:6:18
    |
 LL |         &None => 1
    |                   - help: missing a comma here to end this `match` arm
diff --git a/src/test/ui/missing/missing-derivable-attr.rs b/src/test/ui/missing/missing-derivable-attr.rs
index 7eee51e4076..58c94de5059 100644
--- a/src/test/ui/missing/missing-derivable-attr.rs
+++ b/src/test/ui/missing/missing-derivable-attr.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.
-
 trait MyEq {
     fn eq(&self, other: &Self) -> bool;
 }
diff --git a/src/test/ui/missing/missing-derivable-attr.stderr b/src/test/ui/missing/missing-derivable-attr.stderr
index cccba2f5f3f..e3e61bcb391 100644
--- a/src/test/ui/missing/missing-derivable-attr.stderr
+++ b/src/test/ui/missing/missing-derivable-attr.stderr
@@ -1,5 +1,5 @@
 error[E0046]: not all trait items implemented, missing: `eq`
-  --> $DIR/missing-derivable-attr.rs:23:1
+  --> $DIR/missing-derivable-attr.rs:13:1
    |
 LL |     fn eq(&self, other: &Self) -> bool;
    |     ----------------------------------- `eq` from trait
diff --git a/src/test/ui/missing/missing-fields-in-struct-pattern.rs b/src/test/ui/missing/missing-fields-in-struct-pattern.rs
index dfde3799499..24b6b55db66 100644
--- a/src/test/ui/missing/missing-fields-in-struct-pattern.rs
+++ b/src/test/ui/missing/missing-fields-in-struct-pattern.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.
-
 struct S(usize, usize, usize, usize);
 
 fn main() {
diff --git a/src/test/ui/missing/missing-fields-in-struct-pattern.stderr b/src/test/ui/missing/missing-fields-in-struct-pattern.stderr
index d1c3260f11e..5d88a5d03e2 100644
--- a/src/test/ui/missing/missing-fields-in-struct-pattern.stderr
+++ b/src/test/ui/missing/missing-fields-in-struct-pattern.stderr
@@ -1,11 +1,11 @@
 error[E0026]: struct `S` does not have fields named `a`, `b`, `c`, `d`
-  --> $DIR/missing-fields-in-struct-pattern.rs:14:16
+  --> $DIR/missing-fields-in-struct-pattern.rs:4:16
    |
 LL |     if let S { a, b, c, d } = S(1, 2, 3, 4) {
    |                ^  ^  ^  ^ struct `S` does not have these fields
 
 error[E0027]: pattern does not mention fields `0`, `1`, `2`, `3`
-  --> $DIR/missing-fields-in-struct-pattern.rs:14:12
+  --> $DIR/missing-fields-in-struct-pattern.rs:4:12
    |
 LL |     if let S { a, b, c, d } = S(1, 2, 3, 4) {
    |            ^^^^^^^^^^^^^^^^ missing fields `0`, `1`, `2`, `3`
diff --git a/src/test/ui/missing/missing-items/auxiliary/m1.rs b/src/test/ui/missing/missing-items/auxiliary/m1.rs
index 49fc586d6b5..7705066760c 100644
--- a/src/test/ui/missing/missing-items/auxiliary/m1.rs
+++ b/src/test/ui/missing/missing-items/auxiliary/m1.rs
@@ -1,14 +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 trait X {
     const CONSTANT: u32;
     type Type;
diff --git a/src/test/ui/missing/missing-items/issue-40221.rs b/src/test/ui/missing/missing-items/issue-40221.rs
index 526fc3a8658..e1f7e975b80 100644
--- a/src/test/ui/missing/missing-items/issue-40221.rs
+++ b/src/test/ui/missing/missing-items/issue-40221.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.
-
 enum P {
     C(PC),
 }
diff --git a/src/test/ui/missing/missing-items/issue-40221.stderr b/src/test/ui/missing/missing-items/issue-40221.stderr
index 81c9f40f6cf..437fb7bbc31 100644
--- a/src/test/ui/missing/missing-items/issue-40221.stderr
+++ b/src/test/ui/missing/missing-items/issue-40221.stderr
@@ -1,5 +1,5 @@
 error[E0004]: non-exhaustive patterns: `C(QA)` not covered
-  --> $DIR/issue-40221.rs:21:11
+  --> $DIR/issue-40221.rs:11:11
    |
 LL |     match proto { //~ ERROR non-exhaustive patterns
    |           ^^^^^ pattern `C(QA)` not covered
diff --git a/src/test/ui/missing/missing-items/m2.rs b/src/test/ui/missing/missing-items/m2.rs
index f655047f6f5..c2a6914abc9 100644
--- a/src/test/ui/missing/missing-items/m2.rs
+++ b/src/test/ui/missing/missing-items/m2.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:m1.rs
 
 
diff --git a/src/test/ui/missing/missing-items/m2.stderr b/src/test/ui/missing/missing-items/m2.stderr
index 3f7a4039eb7..b2245750518 100644
--- a/src/test/ui/missing/missing-items/m2.stderr
+++ b/src/test/ui/missing/missing-items/m2.stderr
@@ -1,5 +1,5 @@
 error[E0046]: not all trait items implemented, missing: `CONSTANT`, `Type`, `method`
-  --> $DIR/m2.rs:19:1
+  --> $DIR/m2.rs:9:1
    |
 LL | impl m1::X for X { //~ ERROR not all trait items implemented
    | ^^^^^^^^^^^^^^^^ missing `CONSTANT`, `Type`, `method` in implementation
diff --git a/src/test/ui/missing/missing-items/missing-type-parameter.rs b/src/test/ui/missing/missing-items/missing-type-parameter.rs
index f2d5359fb16..8a64053a4f0 100644
--- a/src/test/ui/missing/missing-items/missing-type-parameter.rs
+++ b/src/test/ui/missing/missing-items/missing-type-parameter.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.
-
 fn foo<X>() { }
 
 fn main() {
diff --git a/src/test/ui/missing/missing-items/missing-type-parameter.stderr b/src/test/ui/missing/missing-items/missing-type-parameter.stderr
index a27e8aac28f..619377198e1 100644
--- a/src/test/ui/missing/missing-items/missing-type-parameter.stderr
+++ b/src/test/ui/missing/missing-items/missing-type-parameter.stderr
@@ -1,5 +1,5 @@
 error[E0282]: type annotations needed
-  --> $DIR/missing-type-parameter.rs:14:5
+  --> $DIR/missing-type-parameter.rs:4:5
    |
 LL |     foo(); //~ ERROR type annotations needed
    |     ^^^ cannot infer type for `X`
diff --git a/src/test/ui/missing/missing-macro-use.rs b/src/test/ui/missing/missing-macro-use.rs
index bfe49ea0009..dff4c94fcf4 100644
--- a/src/test/ui/missing/missing-macro-use.rs
+++ b/src/test/ui/missing/missing-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
 
 extern crate two_macros;
diff --git a/src/test/ui/missing/missing-macro-use.stderr b/src/test/ui/missing/missing-macro-use.stderr
index 6986b4d5733..01a7beb3b05 100644
--- a/src/test/ui/missing/missing-macro-use.stderr
+++ b/src/test/ui/missing/missing-macro-use.stderr
@@ -1,5 +1,5 @@
 error: cannot find macro `macro_two!` in this scope
-  --> $DIR/missing-macro-use.rs:16:5
+  --> $DIR/missing-macro-use.rs:6:5
    |
 LL |     macro_two!();
    |     ^^^^^^^^^
diff --git a/src/test/ui/missing/missing-main.rs b/src/test/ui/missing/missing-main.rs
index 2788a5c2d58..6ad54453309 100644
--- a/src/test/ui/missing/missing-main.rs
+++ b/src/test/ui/missing/missing-main.rs
@@ -1,12 +1,2 @@
-// 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.
-
 // error-pattern: `main` function not found
 fn mian() { }
diff --git a/src/test/ui/missing/missing-return.rs b/src/test/ui/missing/missing-return.rs
index efd0c827a35..6a171753d9e 100644
--- a/src/test/ui/missing/missing-return.rs
+++ b/src/test/ui/missing/missing-return.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.
-
 // error-pattern: return
 
 fn f() -> isize { }
diff --git a/src/test/ui/missing/missing-return.stderr b/src/test/ui/missing/missing-return.stderr
index d12a5832877..6d42dafd6f1 100644
--- a/src/test/ui/missing/missing-return.stderr
+++ b/src/test/ui/missing/missing-return.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/missing-return.rs:13:17
+  --> $DIR/missing-return.rs:3:17
    |
 LL | fn f() -> isize { }
    |                 ^^^ expected isize, found ()
diff --git a/src/test/ui/missing/missing-semicolon-warning.rs b/src/test/ui/missing/missing-semicolon-warning.rs
index 219f68877be..11204af702a 100644
--- a/src/test/ui/missing/missing-semicolon-warning.rs
+++ b/src/test/ui/missing/missing-semicolon-warning.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.
-
 // compile-pass
 #![allow(unused)]
 
diff --git a/src/test/ui/missing/missing-semicolon-warning.stderr b/src/test/ui/missing/missing-semicolon-warning.stderr
index c294e3eaf9c..50627c3252d 100644
--- a/src/test/ui/missing/missing-semicolon-warning.stderr
+++ b/src/test/ui/missing/missing-semicolon-warning.stderr
@@ -1,5 +1,5 @@
 warning: expected `;`, found keyword `let`
-  --> $DIR/missing-semicolon-warning.rs:16:12
+  --> $DIR/missing-semicolon-warning.rs:6:12
    |
 LL |         $( let x = $e1 )*; //~ WARN expected `;`
    |            ^^^
@@ -10,7 +10,7 @@ LL | fn main() { m!(0, 0; 0, 0); }
    = note: This was erroneously allowed and will become a hard error in a future release
 
 warning: expected `;`, found `println`
-  --> $DIR/missing-semicolon-warning.rs:17:12
+  --> $DIR/missing-semicolon-warning.rs:7:12
    |
 LL |         $( println!("{}", $e2) )*; //~ WARN expected `;`
    |            ^^^^^^^
diff --git a/src/test/ui/missing/missing-stability.rs b/src/test/ui/missing/missing-stability.rs
index 1922efb5e19..86841706325 100644
--- a/src/test/ui/missing/missing-stability.rs
+++ b/src/test/ui/missing/missing-stability.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.
-
 // Checks that exported items without stability attributes cause an error
 
 #![crate_type="lib"]
diff --git a/src/test/ui/missing/missing-stability.stderr b/src/test/ui/missing/missing-stability.stderr
index 6e2802e43c5..e55bd00e2c6 100644
--- a/src/test/ui/missing/missing-stability.stderr
+++ b/src/test/ui/missing/missing-stability.stderr
@@ -1,5 +1,5 @@
 error: This node does not have a stability attribute
-  --> $DIR/missing-stability.rs:18:1
+  --> $DIR/missing-stability.rs:8:1
    |
 LL | / pub fn unmarked() {
 LL | |     //~^ ERROR This node does not have a stability attribute
@@ -8,7 +8,7 @@ LL | | }
    | |_^
 
 error: This node does not have a stability attribute
-  --> $DIR/missing-stability.rs:32:5
+  --> $DIR/missing-stability.rs:22:5
    |
 LL |     pub fn unmarked() {}
    |     ^^^^^^^^^^^^^^^^^^^^