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/allocator | |
| parent | 14b96659e4e9b2f31431df48f47c219957e2666a (diff) | |
| parent | e132d9066dd1d7acede428438ba8a32345ac343f (diff) | |
| download | rust-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/allocator')
| -rw-r--r-- | src/test/ui/allocator/auxiliary/system-allocator.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/allocator/auxiliary/system-allocator2.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/allocator/function-allocator.rs | 11 | ||||
| -rw-r--r-- | src/test/ui/allocator/function-allocator.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/allocator/not-an-allocator.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/allocator/not-an-allocator.stderr | 8 | ||||
| -rw-r--r-- | src/test/ui/allocator/two-allocators.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/allocator/two-allocators.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/allocator/two-allocators2.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/allocator/two-allocators3.rs | 10 |
10 files changed, 6 insertions, 77 deletions
diff --git a/src/test/ui/allocator/auxiliary/system-allocator.rs b/src/test/ui/allocator/auxiliary/system-allocator.rs index e5650d5b7b0..97b86bbc96d 100644 --- a/src/test/ui/allocator/auxiliary/system-allocator.rs +++ b/src/test/ui/allocator/auxiliary/system-allocator.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. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/ui/allocator/auxiliary/system-allocator2.rs b/src/test/ui/allocator/auxiliary/system-allocator2.rs index e5650d5b7b0..97b86bbc96d 100644 --- a/src/test/ui/allocator/auxiliary/system-allocator2.rs +++ b/src/test/ui/allocator/auxiliary/system-allocator2.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. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/ui/allocator/function-allocator.rs b/src/test/ui/allocator/function-allocator.rs index 989c102b86e..d53f6e9b72e 100644 --- a/src/test/ui/allocator/function-allocator.rs +++ b/src/test/ui/allocator/function-allocator.rs @@ -1,14 +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. - - #[global_allocator] fn foo() {} //~ ERROR: allocators must be statics diff --git a/src/test/ui/allocator/function-allocator.stderr b/src/test/ui/allocator/function-allocator.stderr index 8649b6b1244..ecb6e4d4ecd 100644 --- a/src/test/ui/allocator/function-allocator.stderr +++ b/src/test/ui/allocator/function-allocator.stderr @@ -1,5 +1,5 @@ error: allocators must be statics - --> $DIR/function-allocator.rs:13:1 + --> $DIR/function-allocator.rs:2:1 | LL | fn foo() {} //~ ERROR: allocators must be statics | ^^^^^^^^^^^ diff --git a/src/test/ui/allocator/not-an-allocator.rs b/src/test/ui/allocator/not-an-allocator.rs index 6559335960a..417c371bdbf 100644 --- a/src/test/ui/allocator/not-an-allocator.rs +++ b/src/test/ui/allocator/not-an-allocator.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. - #[global_allocator] static A: usize = 0; //~^ the trait bound `usize: diff --git a/src/test/ui/allocator/not-an-allocator.stderr b/src/test/ui/allocator/not-an-allocator.stderr index 757c5066a66..dd2cf36ff1b 100644 --- a/src/test/ui/allocator/not-an-allocator.stderr +++ b/src/test/ui/allocator/not-an-allocator.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `usize: std::alloc::GlobalAlloc` is not satisfied - --> $DIR/not-an-allocator.rs:12:1 + --> $DIR/not-an-allocator.rs:2:1 | LL | static A: usize = 0; | ^^^^^^^^^^^^^^^^^^^^ the trait `std::alloc::GlobalAlloc` is not implemented for `usize` @@ -7,7 +7,7 @@ LL | static A: usize = 0; = note: required by `std::alloc::GlobalAlloc::alloc` error[E0277]: the trait bound `usize: std::alloc::GlobalAlloc` is not satisfied - --> $DIR/not-an-allocator.rs:12:1 + --> $DIR/not-an-allocator.rs:2:1 | LL | static A: usize = 0; | ^^^^^^^^^^^^^^^^^^^^ the trait `std::alloc::GlobalAlloc` is not implemented for `usize` @@ -15,7 +15,7 @@ LL | static A: usize = 0; = note: required by `std::alloc::GlobalAlloc::dealloc` error[E0277]: the trait bound `usize: std::alloc::GlobalAlloc` is not satisfied - --> $DIR/not-an-allocator.rs:12:1 + --> $DIR/not-an-allocator.rs:2:1 | LL | static A: usize = 0; | ^^^^^^^^^^^^^^^^^^^^ the trait `std::alloc::GlobalAlloc` is not implemented for `usize` @@ -23,7 +23,7 @@ LL | static A: usize = 0; = note: required by `std::alloc::GlobalAlloc::realloc` error[E0277]: the trait bound `usize: std::alloc::GlobalAlloc` is not satisfied - --> $DIR/not-an-allocator.rs:12:1 + --> $DIR/not-an-allocator.rs:2:1 | LL | static A: usize = 0; | ^^^^^^^^^^^^^^^^^^^^ the trait `std::alloc::GlobalAlloc` is not implemented for `usize` diff --git a/src/test/ui/allocator/two-allocators.rs b/src/test/ui/allocator/two-allocators.rs index 7a97a11df20..c967a45c7b4 100644 --- a/src/test/ui/allocator/two-allocators.rs +++ b/src/test/ui/allocator/two-allocators.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. - use std::alloc::System; #[global_allocator] diff --git a/src/test/ui/allocator/two-allocators.stderr b/src/test/ui/allocator/two-allocators.stderr index 5285ee93f2d..da247f6c316 100644 --- a/src/test/ui/allocator/two-allocators.stderr +++ b/src/test/ui/allocator/two-allocators.stderr @@ -1,5 +1,5 @@ error: cannot define more than one #[global_allocator] - --> $DIR/two-allocators.rs:16:1 + --> $DIR/two-allocators.rs:6:1 | LL | static B: System = System; | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/allocator/two-allocators2.rs b/src/test/ui/allocator/two-allocators2.rs index e747140dfe5..b7a07cc274e 100644 --- a/src/test/ui/allocator/two-allocators2.rs +++ b/src/test/ui/allocator/two-allocators2.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:system-allocator.rs // no-prefer-dynamic // error-pattern: the #[global_allocator] in diff --git a/src/test/ui/allocator/two-allocators3.rs b/src/test/ui/allocator/two-allocators3.rs index dd86b02bd20..8a06335c031 100644 --- a/src/test/ui/allocator/two-allocators3.rs +++ b/src/test/ui/allocator/two-allocators3.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:system-allocator.rs // aux-build:system-allocator2.rs // no-prefer-dynamic |
