diff options
| author | bors <bors@rust-lang.org> | 2018-12-26 16:16:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-12-26 16:16:02 +0000 |
| commit | 79d8a0fcefa5134db2a94739b1d18daa01fc6e9f (patch) | |
| tree | 9937976e72116b7deb2035e6a251472168f1ad64 /src/test/ui/recursion | |
| parent | 14b96659e4e9b2f31431df48f47c219957e2666a (diff) | |
| parent | e132d9066dd1d7acede428438ba8a32345ac343f (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/recursion')
| -rw-r--r-- | src/test/ui/recursion/auxiliary/recursive_reexports.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/recursion/recursion.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/recursion/recursion.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/recursion/recursive-enum.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/recursion/recursive-enum.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/recursion/recursive-reexports.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/recursion/recursive-reexports.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/recursion/recursive-requirements.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/recursion/recursive-requirements.stderr | 8 | ||||
| -rw-r--r-- | src/test/ui/recursion/recursive-static-definition.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/recursion/recursive-static-definition.stderr | 6 | ||||
| -rw-r--r-- | src/test/ui/recursion/recursive-types-are-not-uninhabited.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/recursion/recursive-types-are-not-uninhabited.stderr | 2 |
13 files changed, 11 insertions, 81 deletions
diff --git a/src/test/ui/recursion/auxiliary/recursive_reexports.rs b/src/test/ui/recursion/auxiliary/recursive_reexports.rs index 1186e3d62f7..f98fa71009f 100644 --- a/src/test/ui/recursion/auxiliary/recursive_reexports.rs +++ b/src/test/ui/recursion/auxiliary/recursive_reexports.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. - pub mod foo { pub use foo; } diff --git a/src/test/ui/recursion/recursion.rs b/src/test/ui/recursion/recursion.rs index 3221ae46296..ba3cc33dc30 100644 --- a/src/test/ui/recursion/recursion.rs +++ b/src/test/ui/recursion/recursion.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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. - enum Nil {NilValue} struct Cons<T> {head:isize, tail:T} trait Dot {fn dot(&self, other:Self) -> isize;} diff --git a/src/test/ui/recursion/recursion.stderr b/src/test/ui/recursion/recursion.stderr index 5953e5c4087..1bef37ad588 100644 --- a/src/test/ui/recursion/recursion.stderr +++ b/src/test/ui/recursion/recursion.stderr @@ -1,5 +1,5 @@ error: reached the recursion limit while instantiating `test::<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Nil>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>` - --> $DIR/recursion.rs:22:1 + --> $DIR/recursion.rs:12:1 | LL | / fn test<T:Dot> (n:isize, i:isize, first:T, second:T) ->isize { //~ ERROR recursion limit LL | | match n { 0 => {first.dot(second)} diff --git a/src/test/ui/recursion/recursive-enum.rs b/src/test/ui/recursion/recursive-enum.rs index ce0d451e3f9..32e707607b8 100644 --- a/src/test/ui/recursion/recursive-enum.rs +++ b/src/test/ui/recursion/recursive-enum.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 List<T> { Cons(T, List<T>), Nil } //~^ ERROR recursive type `List` has infinite size diff --git a/src/test/ui/recursion/recursive-enum.stderr b/src/test/ui/recursion/recursive-enum.stderr index f709ba6ff0a..e4674b57a6d 100644 --- a/src/test/ui/recursion/recursive-enum.stderr +++ b/src/test/ui/recursion/recursive-enum.stderr @@ -1,5 +1,5 @@ error[E0072]: recursive type `List` has infinite size - --> $DIR/recursive-enum.rs:11:1 + --> $DIR/recursive-enum.rs:1:1 | LL | enum List<T> { Cons(T, List<T>), Nil } | ^^^^^^^^^^^^ ------- recursive without indirection diff --git a/src/test/ui/recursion/recursive-reexports.rs b/src/test/ui/recursion/recursive-reexports.rs index b57b73325c0..3d9fda35c68 100644 --- a/src/test/ui/recursion/recursive-reexports.rs +++ b/src/test/ui/recursion/recursive-reexports.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. - // aux-build:recursive_reexports.rs extern crate recursive_reexports; diff --git a/src/test/ui/recursion/recursive-reexports.stderr b/src/test/ui/recursion/recursive-reexports.stderr index e6b8647a981..681931ef830 100644 --- a/src/test/ui/recursion/recursive-reexports.stderr +++ b/src/test/ui/recursion/recursive-reexports.stderr @@ -1,5 +1,5 @@ error[E0412]: cannot find type `S` in module `recursive_reexports` - --> $DIR/recursive-reexports.rs:15:32 + --> $DIR/recursive-reexports.rs:5:32 | LL | fn f() -> recursive_reexports::S {} //~ ERROR cannot find type `S` in module `recursive_reexports` | ^ not found in `recursive_reexports` diff --git a/src/test/ui/recursion/recursive-requirements.rs b/src/test/ui/recursion/recursive-requirements.rs index dd6d2f6a225..9cfbee5f1e9 100644 --- a/src/test/ui/recursion/recursive-requirements.rs +++ b/src/test/ui/recursion/recursive-requirements.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. - use std::marker::PhantomData; struct AssertSync<T: Sync>(PhantomData<T>); diff --git a/src/test/ui/recursion/recursive-requirements.stderr b/src/test/ui/recursion/recursive-requirements.stderr index 8fe282505e9..b3041902aca 100644 --- a/src/test/ui/recursion/recursive-requirements.stderr +++ b/src/test/ui/recursion/recursive-requirements.stderr @@ -1,5 +1,5 @@ error[E0277]: `*const Bar` cannot be shared between threads safely - --> $DIR/recursive-requirements.rs:26:12 + --> $DIR/recursive-requirements.rs:16:12 | LL | let _: AssertSync<Foo> = unimplemented!(); | ^^^^^^^^^^^^^^^ `*const Bar` cannot be shared between threads safely @@ -7,13 +7,13 @@ LL | let _: AssertSync<Foo> = unimplemented!(); = help: within `Foo`, the trait `std::marker::Sync` is not implemented for `*const Bar` = note: required because it appears within the type `Foo` note: required by `AssertSync` - --> $DIR/recursive-requirements.rs:13:1 + --> $DIR/recursive-requirements.rs:3:1 | LL | struct AssertSync<T: Sync>(PhantomData<T>); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: `*const Foo` cannot be shared between threads safely - --> $DIR/recursive-requirements.rs:26:12 + --> $DIR/recursive-requirements.rs:16:12 | LL | let _: AssertSync<Foo> = unimplemented!(); | ^^^^^^^^^^^^^^^ `*const Foo` cannot be shared between threads safely @@ -23,7 +23,7 @@ LL | let _: AssertSync<Foo> = unimplemented!(); = note: required because it appears within the type `std::marker::PhantomData<Bar>` = note: required because it appears within the type `Foo` note: required by `AssertSync` - --> $DIR/recursive-requirements.rs:13:1 + --> $DIR/recursive-requirements.rs:3:1 | LL | struct AssertSync<T: Sync>(PhantomData<T>); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/recursion/recursive-static-definition.rs b/src/test/ui/recursion/recursive-static-definition.rs index 62c1859e09d..e816ce4e0c4 100644 --- a/src/test/ui/recursion/recursive-static-definition.rs +++ b/src/test/ui/recursion/recursive-static-definition.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. - pub static FOO: u32 = FOO; //~^ ERROR cycle detected when const-evaluating `FOO` diff --git a/src/test/ui/recursion/recursive-static-definition.stderr b/src/test/ui/recursion/recursive-static-definition.stderr index c9a5e5eb447..b724c261a7c 100644 --- a/src/test/ui/recursion/recursive-static-definition.stderr +++ b/src/test/ui/recursion/recursive-static-definition.stderr @@ -1,17 +1,17 @@ error[E0391]: cycle detected when const-evaluating `FOO` - --> $DIR/recursive-static-definition.rs:11:23 + --> $DIR/recursive-static-definition.rs:1:23 | LL | pub static FOO: u32 = FOO; | ^^^ | note: ...which requires const-evaluating `FOO`... - --> $DIR/recursive-static-definition.rs:11:1 + --> $DIR/recursive-static-definition.rs:1:1 | LL | pub static FOO: u32 = FOO; | ^^^^^^^^^^^^^^^^^^^^^^^^^^ = note: ...which again requires const-evaluating `FOO`, completing the cycle note: cycle used when const-evaluating + checking `FOO` - --> $DIR/recursive-static-definition.rs:11:1 + --> $DIR/recursive-static-definition.rs:1:1 | LL | pub static FOO: u32 = FOO; | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/recursion/recursive-types-are-not-uninhabited.rs b/src/test/ui/recursion/recursive-types-are-not-uninhabited.rs index fa936697072..b3e4efb9940 100644 --- a/src/test/ui/recursion/recursive-types-are-not-uninhabited.rs +++ b/src/test/ui/recursion/recursive-types-are-not-uninhabited.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 R<'a> { r: &'a R<'a>, } diff --git a/src/test/ui/recursion/recursive-types-are-not-uninhabited.stderr b/src/test/ui/recursion/recursive-types-are-not-uninhabited.stderr index c4d40412760..dad98cff452 100644 --- a/src/test/ui/recursion/recursive-types-are-not-uninhabited.stderr +++ b/src/test/ui/recursion/recursive-types-are-not-uninhabited.stderr @@ -1,5 +1,5 @@ error[E0005]: refutable pattern in local binding: `Err(_)` not covered - --> $DIR/recursive-types-are-not-uninhabited.rs:16:9 + --> $DIR/recursive-types-are-not-uninhabited.rs:6:9 | LL | let Ok(x) = res; | ^^^^^ pattern `Err(_)` not covered |
