about summary refs log tree commit diff
path: root/src/test/ui/invalid
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/invalid
parent14b96659e4e9b2f31431df48f47c219957e2666a (diff)
parente132d9066dd1d7acede428438ba8a32345ac343f (diff)
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/invalid')
-rw-r--r--src/test/ui/invalid/invalid-crate-type.rs10
-rw-r--r--src/test/ui/invalid/invalid-crate-type.stderr18
-rw-r--r--src/test/ui/invalid/invalid-inline.rs9
-rw-r--r--src/test/ui/invalid/invalid-inline.stderr6
-rw-r--r--src/test/ui/invalid/invalid-macro-matcher.rs10
-rw-r--r--src/test/ui/invalid/invalid-macro-matcher.stderr2
-rw-r--r--src/test/ui/invalid/invalid-path-in-const.rs10
-rw-r--r--src/test/ui/invalid/invalid-path-in-const.stderr2
-rw-r--r--src/test/ui/invalid/invalid-plugin-attr.rs10
-rw-r--r--src/test/ui/invalid/invalid-plugin-attr.stderr6
-rw-r--r--src/test/ui/invalid/invalid-variadic-function.rs10
-rw-r--r--src/test/ui/invalid/invalid-variadic-function.stderr4
12 files changed, 19 insertions, 78 deletions
diff --git a/src/test/ui/invalid/invalid-crate-type.rs b/src/test/ui/invalid/invalid-crate-type.rs
index e7f4e32dc7c..6c44c3b4f2b 100644
--- a/src/test/ui/invalid/invalid-crate-type.rs
+++ b/src/test/ui/invalid/invalid-crate-type.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.
-
 // regression test for issue 11256
 #![crate_type="foo"]    //~ ERROR invalid `crate_type` value
 
diff --git a/src/test/ui/invalid/invalid-crate-type.stderr b/src/test/ui/invalid/invalid-crate-type.stderr
index c82da865f33..63edd04650b 100644
--- a/src/test/ui/invalid/invalid-crate-type.stderr
+++ b/src/test/ui/invalid/invalid-crate-type.stderr
@@ -1,5 +1,5 @@
 error: invalid `crate_type` value
-  --> $DIR/invalid-crate-type.rs:12:15
+  --> $DIR/invalid-crate-type.rs:2:15
    |
 LL | #![crate_type="foo"]    //~ ERROR invalid `crate_type` value
    |               ^^^^^
@@ -7,49 +7,49 @@ LL | #![crate_type="foo"]    //~ ERROR invalid `crate_type` value
    = note: #[deny(unknown_crate_types)] on by default
 
 error: invalid `crate_type` value
-  --> $DIR/invalid-crate-type.rs:16:15
+  --> $DIR/invalid-crate-type.rs:6:15
    |
 LL | #![crate_type="statoclib"]
    |               ^^^^^^^^^^^ help: did you mean: `"staticlib"`
 
 error: invalid `crate_type` value
-  --> $DIR/invalid-crate-type.rs:21:15
+  --> $DIR/invalid-crate-type.rs:11:15
    |
 LL | #![crate_type="procmacro"]
    |               ^^^^^^^^^^^ help: did you mean: `"proc-macro"`
 
 error: invalid `crate_type` value
-  --> $DIR/invalid-crate-type.rs:26:15
+  --> $DIR/invalid-crate-type.rs:16:15
    |
 LL | #![crate_type="static-lib"]
    |               ^^^^^^^^^^^^ help: did you mean: `"staticlib"`
 
 error: invalid `crate_type` value
-  --> $DIR/invalid-crate-type.rs:31:15
+  --> $DIR/invalid-crate-type.rs:21:15
    |
 LL | #![crate_type="drylib"]
    |               ^^^^^^^^ help: did you mean: `"dylib"`
 
 error: invalid `crate_type` value
-  --> $DIR/invalid-crate-type.rs:36:15
+  --> $DIR/invalid-crate-type.rs:26:15
    |
 LL | #![crate_type="dlib"]
    |               ^^^^^^ help: did you mean: `"rlib"`
 
 error: invalid `crate_type` value
-  --> $DIR/invalid-crate-type.rs:41:15
+  --> $DIR/invalid-crate-type.rs:31:15
    |
 LL | #![crate_type="lob"]
    |               ^^^^^ help: did you mean: `"lib"`
 
 error: invalid `crate_type` value
-  --> $DIR/invalid-crate-type.rs:46:15
+  --> $DIR/invalid-crate-type.rs:36:15
    |
 LL | #![crate_type="bon"]
    |               ^^^^^ help: did you mean: `"bin"`
 
 error: invalid `crate_type` value
-  --> $DIR/invalid-crate-type.rs:51:15
+  --> $DIR/invalid-crate-type.rs:41:15
    |
 LL | #![crate_type="cdalib"]
    |               ^^^^^^^^ help: did you mean: `"cdylib"`
diff --git a/src/test/ui/invalid/invalid-inline.rs b/src/test/ui/invalid/invalid-inline.rs
index 93b985b4fb0..8aa8f99f522 100644
--- a/src/test/ui/invalid/invalid-inline.rs
+++ b/src/test/ui/invalid/invalid-inline.rs
@@ -1,12 +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.
 #![allow(dead_code)]
 
 #[inline(please_no)] //~ ERROR invalid argument
diff --git a/src/test/ui/invalid/invalid-inline.stderr b/src/test/ui/invalid/invalid-inline.stderr
index d4861c23aee..fdbd25070f7 100644
--- a/src/test/ui/invalid/invalid-inline.stderr
+++ b/src/test/ui/invalid/invalid-inline.stderr
@@ -1,17 +1,17 @@
 error[E0535]: invalid argument
-  --> $DIR/invalid-inline.rs:12:10
+  --> $DIR/invalid-inline.rs:3:10
    |
 LL | #[inline(please_no)] //~ ERROR invalid argument
    |          ^^^^^^^^^
 
 error[E0534]: expected one argument
-  --> $DIR/invalid-inline.rs:16:1
+  --> $DIR/invalid-inline.rs:7:1
    |
 LL | #[inline(please,no)] //~ ERROR expected one argument
    | ^^^^^^^^^^^^^^^^^^^^
 
 error[E0534]: expected one argument
-  --> $DIR/invalid-inline.rs:20:1
+  --> $DIR/invalid-inline.rs:11:1
    |
 LL | #[inline()] //~ ERROR expected one argument
    | ^^^^^^^^^^^
diff --git a/src/test/ui/invalid/invalid-macro-matcher.rs b/src/test/ui/invalid/invalid-macro-matcher.rs
index d710f5647dd..ff79d4e1a92 100644
--- a/src/test/ui/invalid/invalid-macro-matcher.rs
+++ b/src/test/ui/invalid/invalid-macro-matcher.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.
-
 #![allow(unused_macros)]
 
 macro_rules! invalid {
diff --git a/src/test/ui/invalid/invalid-macro-matcher.stderr b/src/test/ui/invalid/invalid-macro-matcher.stderr
index d3ddb613f94..5d6c70fa30b 100644
--- a/src/test/ui/invalid/invalid-macro-matcher.stderr
+++ b/src/test/ui/invalid/invalid-macro-matcher.stderr
@@ -1,5 +1,5 @@
 error: invalid macro matcher; matchers must be contained in balanced delimiters
-  --> $DIR/invalid-macro-matcher.rs:14:5
+  --> $DIR/invalid-macro-matcher.rs:4:5
    |
 LL |     _ => (); //~ ERROR invalid macro matcher
    |     ^
diff --git a/src/test/ui/invalid/invalid-path-in-const.rs b/src/test/ui/invalid/invalid-path-in-const.rs
index ab839e7630d..51eb8607211 100644
--- a/src/test/ui/invalid/invalid-path-in-const.rs
+++ b/src/test/ui/invalid/invalid-path-in-const.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.
-
 fn main() {
     fn f(a: [u8; u32::DOESNOTEXIST]) {}
     //~^ ERROR no associated item named `DOESNOTEXIST` found for type `u32`
diff --git a/src/test/ui/invalid/invalid-path-in-const.stderr b/src/test/ui/invalid/invalid-path-in-const.stderr
index 9214800b93a..6541c92c691 100644
--- a/src/test/ui/invalid/invalid-path-in-const.stderr
+++ b/src/test/ui/invalid/invalid-path-in-const.stderr
@@ -1,5 +1,5 @@
 error[E0599]: no associated item named `DOESNOTEXIST` found for type `u32` in the current scope
-  --> $DIR/invalid-path-in-const.rs:12:18
+  --> $DIR/invalid-path-in-const.rs:2:18
    |
 LL |     fn f(a: [u8; u32::DOESNOTEXIST]) {}
    |                  ^^^^^^^^^^^^^^^^^ associated item not found in `u32`
diff --git a/src/test/ui/invalid/invalid-plugin-attr.rs b/src/test/ui/invalid/invalid-plugin-attr.rs
index 3bf09e10ae8..2cbd5233861 100644
--- a/src/test/ui/invalid/invalid-plugin-attr.rs
+++ b/src/test/ui/invalid/invalid-plugin-attr.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.
-
 #![deny(unused_attributes)]
 #![feature(plugin)]
 
diff --git a/src/test/ui/invalid/invalid-plugin-attr.stderr b/src/test/ui/invalid/invalid-plugin-attr.stderr
index a5d321ea9bd..2d7ae1f5cfe 100644
--- a/src/test/ui/invalid/invalid-plugin-attr.stderr
+++ b/src/test/ui/invalid/invalid-plugin-attr.stderr
@@ -1,17 +1,17 @@
 error: unused attribute
-  --> $DIR/invalid-plugin-attr.rs:14:1
+  --> $DIR/invalid-plugin-attr.rs:4:1
    |
 LL | #[plugin(bla)]  //~ ERROR unused attribute
    | ^^^^^^^^^^^^^^
    |
 note: lint level defined here
-  --> $DIR/invalid-plugin-attr.rs:11:9
+  --> $DIR/invalid-plugin-attr.rs:1:9
    |
 LL | #![deny(unused_attributes)]
    |         ^^^^^^^^^^^^^^^^^
 
 error: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo]
-  --> $DIR/invalid-plugin-attr.rs:14:1
+  --> $DIR/invalid-plugin-attr.rs:4:1
    |
 LL | #[plugin(bla)]  //~ ERROR unused attribute
    | ^^^^^^^^^^^^^^
diff --git a/src/test/ui/invalid/invalid-variadic-function.rs b/src/test/ui/invalid/invalid-variadic-function.rs
index 3d421e00b08..aea630e7c26 100644
--- a/src/test/ui/invalid/invalid-variadic-function.rs
+++ b/src/test/ui/invalid/invalid-variadic-function.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.
-
 extern "C" fn foo(x: u8, ...);
 //~^ ERROR only foreign functions are allowed to be variadic
 //~| ERROR expected one of `->`, `where`, or `{`, found `;`
diff --git a/src/test/ui/invalid/invalid-variadic-function.stderr b/src/test/ui/invalid/invalid-variadic-function.stderr
index 13678d10ef5..7a0b8066fd5 100644
--- a/src/test/ui/invalid/invalid-variadic-function.stderr
+++ b/src/test/ui/invalid/invalid-variadic-function.stderr
@@ -1,11 +1,11 @@
 error: only foreign functions are allowed to be variadic
-  --> $DIR/invalid-variadic-function.rs:11:26
+  --> $DIR/invalid-variadic-function.rs:1:26
    |
 LL | extern "C" fn foo(x: u8, ...);
    |                          ^^^
 
 error: expected one of `->`, `where`, or `{`, found `;`
-  --> $DIR/invalid-variadic-function.rs:11:30
+  --> $DIR/invalid-variadic-function.rs:1:30
    |
 LL | extern "C" fn foo(x: u8, ...);
    |                              ^ expected one of `->`, `where`, or `{` here