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/tuple | |
| 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/tuple')
| -rw-r--r-- | src/test/ui/tuple/tuple-arity-mismatch.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/tuple/tuple-arity-mismatch.stderr | 4 | ||||
| -rw-r--r-- | src/test/ui/tuple/tuple-float-index.fixed | 10 | ||||
| -rw-r--r-- | src/test/ui/tuple/tuple-float-index.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/tuple/tuple-float-index.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/tuple/tuple-index-not-tuple.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/tuple/tuple-index-not-tuple.stderr | 4 | ||||
| -rw-r--r-- | src/test/ui/tuple/tuple-index-out-of-bounds.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/tuple/tuple-index-out-of-bounds.stderr | 4 | ||||
| -rw-r--r-- | src/test/ui/tuple/tuple-struct-fields/test.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/tuple/tuple-struct-fields/test.stderr | 4 | ||||
| -rw-r--r-- | src/test/ui/tuple/tuple-struct-fields/test2.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/tuple/tuple-struct-fields/test2.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/tuple/tuple-struct-fields/test3.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/tuple/tuple-struct-fields/test3.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/tuple/tuple-struct-nonexhaustive.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/tuple/tuple-struct-nonexhaustive.stderr | 2 |
17 files changed, 12 insertions, 102 deletions
diff --git a/src/test/ui/tuple/tuple-arity-mismatch.rs b/src/test/ui/tuple/tuple-arity-mismatch.rs index a71f4410294..1c8b881d246 100644 --- a/src/test/ui/tuple/tuple-arity-mismatch.rs +++ b/src/test/ui/tuple/tuple-arity-mismatch.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. - // Issue #6155 fn first((value, _): (isize, f64)) -> isize { value } diff --git a/src/test/ui/tuple/tuple-arity-mismatch.stderr b/src/test/ui/tuple/tuple-arity-mismatch.stderr index 574a1f0a5c9..650f4c58c77 100644 --- a/src/test/ui/tuple/tuple-arity-mismatch.stderr +++ b/src/test/ui/tuple/tuple-arity-mismatch.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/tuple-arity-mismatch.rs:16:20 + --> $DIR/tuple-arity-mismatch.rs:6:20 | LL | let y = first ((1,2.0,3)); | ^^^^^^^^^ expected a tuple with 2 elements, found one with 3 elements @@ -8,7 +8,7 @@ LL | let y = first ((1,2.0,3)); found type `(isize, f64, {integer})` error[E0308]: mismatched types - --> $DIR/tuple-arity-mismatch.rs:22:20 + --> $DIR/tuple-arity-mismatch.rs:12:20 | LL | let y = first ((1,)); | ^^^^ expected a tuple with 2 elements, found one with 1 elements diff --git a/src/test/ui/tuple/tuple-float-index.fixed b/src/test/ui/tuple/tuple-float-index.fixed index 55bc2f77dad..c93b545afb9 100644 --- a/src/test/ui/tuple/tuple-float-index.fixed +++ b/src/test/ui/tuple/tuple-float-index.fixed @@ -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. - // run-rustfix // compile-flags: -Z parse-only diff --git a/src/test/ui/tuple/tuple-float-index.rs b/src/test/ui/tuple/tuple-float-index.rs index d569ca4cb86..9b669bc4bb8 100644 --- a/src/test/ui/tuple/tuple-float-index.rs +++ b/src/test/ui/tuple/tuple-float-index.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. - // run-rustfix // compile-flags: -Z parse-only diff --git a/src/test/ui/tuple/tuple-float-index.stderr b/src/test/ui/tuple/tuple-float-index.stderr index 15af0834f03..5bbccba39d8 100644 --- a/src/test/ui/tuple/tuple-float-index.stderr +++ b/src/test/ui/tuple/tuple-float-index.stderr @@ -1,5 +1,5 @@ error: unexpected token: `1.1` - --> $DIR/tuple-float-index.rs:15:17 + --> $DIR/tuple-float-index.rs:5:17 | LL | (1, (2, 3)).1.1; //~ ERROR unexpected token: `1.1` | ------------^^^ diff --git a/src/test/ui/tuple/tuple-index-not-tuple.rs b/src/test/ui/tuple/tuple-index-not-tuple.rs index 471104d6872..c478e1c6769 100644 --- a/src/test/ui/tuple/tuple-index-not-tuple.rs +++ b/src/test/ui/tuple/tuple-index-not-tuple.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 { x: isize, y: isize } struct Empty; diff --git a/src/test/ui/tuple/tuple-index-not-tuple.stderr b/src/test/ui/tuple/tuple-index-not-tuple.stderr index fa0d0b4172b..ab9ac4c4142 100644 --- a/src/test/ui/tuple/tuple-index-not-tuple.stderr +++ b/src/test/ui/tuple/tuple-index-not-tuple.stderr @@ -1,11 +1,11 @@ error[E0609]: no field `0` on type `Point` - --> $DIR/tuple-index-not-tuple.rs:16:12 + --> $DIR/tuple-index-not-tuple.rs:6:12 | LL | origin.0; | ^ did you mean `x`? error[E0609]: no field `0` on type `Empty` - --> $DIR/tuple-index-not-tuple.rs:18:11 + --> $DIR/tuple-index-not-tuple.rs:8:11 | LL | Empty.0; | ^ unknown field diff --git a/src/test/ui/tuple/tuple-index-out-of-bounds.rs b/src/test/ui/tuple/tuple-index-out-of-bounds.rs index 35b843676b4..c772c0daa18 100644 --- a/src/test/ui/tuple/tuple-index-out-of-bounds.rs +++ b/src/test/ui/tuple/tuple-index-out-of-bounds.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(i32, i32); fn main() { diff --git a/src/test/ui/tuple/tuple-index-out-of-bounds.stderr b/src/test/ui/tuple/tuple-index-out-of-bounds.stderr index 068e83ab091..86e977a01b7 100644 --- a/src/test/ui/tuple/tuple-index-out-of-bounds.stderr +++ b/src/test/ui/tuple/tuple-index-out-of-bounds.stderr @@ -1,11 +1,11 @@ error[E0609]: no field `2` on type `Point` - --> $DIR/tuple-index-out-of-bounds.rs:17:12 + --> $DIR/tuple-index-out-of-bounds.rs:7:12 | LL | origin.2; | ^ did you mean `0`? error[E0609]: no field `2` on type `({integer}, {integer})` - --> $DIR/tuple-index-out-of-bounds.rs:22:11 + --> $DIR/tuple-index-out-of-bounds.rs:12:11 | LL | tuple.2; | ^ diff --git a/src/test/ui/tuple/tuple-struct-fields/test.rs b/src/test/ui/tuple/tuple-struct-fields/test.rs index c8b77bfabdb..00677090d78 100644 --- a/src/test/ui/tuple/tuple-struct-fields/test.rs +++ b/src/test/ui/tuple/tuple-struct-fields/test.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. - mod foo { type T = (); struct S1(pub(in foo) (), pub(T), pub(crate) (), pub(((), T))); diff --git a/src/test/ui/tuple/tuple-struct-fields/test.stderr b/src/test/ui/tuple/tuple-struct-fields/test.stderr index f83e9dd5458..295f0b146dd 100644 --- a/src/test/ui/tuple/tuple-struct-fields/test.stderr +++ b/src/test/ui/tuple/tuple-struct-fields/test.stderr @@ -1,11 +1,11 @@ error: expected one of `)` or `,`, found `(` - --> $DIR/test.rs:14:26 + --> $DIR/test.rs:4:26 | LL | struct S2(pub((foo)) ()); | ^ expected one of `)` or `,` here error[E0412]: cannot find type `foo` in this scope - --> $DIR/test.rs:14:20 + --> $DIR/test.rs:4:20 | LL | struct S2(pub((foo)) ()); | ^^^ not found in this scope diff --git a/src/test/ui/tuple/tuple-struct-fields/test2.rs b/src/test/ui/tuple/tuple-struct-fields/test2.rs index eead027cb13..7c8e9bbb23c 100644 --- a/src/test/ui/tuple/tuple-struct-fields/test2.rs +++ b/src/test/ui/tuple/tuple-struct-fields/test2.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. - macro_rules! define_struct { ($t:ty) => { struct S1(pub $t); diff --git a/src/test/ui/tuple/tuple-struct-fields/test2.stderr b/src/test/ui/tuple/tuple-struct-fields/test2.stderr index 983e74772ac..9aba84046a1 100644 --- a/src/test/ui/tuple/tuple-struct-fields/test2.stderr +++ b/src/test/ui/tuple/tuple-struct-fields/test2.stderr @@ -1,5 +1,5 @@ error: expected one of `)` or `,`, found `(` - --> $DIR/test2.rs:15:26 + --> $DIR/test2.rs:5:26 | LL | struct S3(pub $t ()); | ^ expected one of `)` or `,` here diff --git a/src/test/ui/tuple/tuple-struct-fields/test3.rs b/src/test/ui/tuple/tuple-struct-fields/test3.rs index d666c8abd3c..8d7c7c35caf 100644 --- a/src/test/ui/tuple/tuple-struct-fields/test3.rs +++ b/src/test/ui/tuple/tuple-struct-fields/test3.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. - macro_rules! define_struct { ($t:ty) => { struct S1(pub($t)); diff --git a/src/test/ui/tuple/tuple-struct-fields/test3.stderr b/src/test/ui/tuple/tuple-struct-fields/test3.stderr index 6738595b997..fc71354a9d6 100644 --- a/src/test/ui/tuple/tuple-struct-fields/test3.stderr +++ b/src/test/ui/tuple/tuple-struct-fields/test3.stderr @@ -1,5 +1,5 @@ error: expected one of `)` or `,`, found `(` - --> $DIR/test3.rs:15:27 + --> $DIR/test3.rs:5:27 | LL | struct S3(pub($t) ()); | ^ expected one of `)` or `,` here diff --git a/src/test/ui/tuple/tuple-struct-nonexhaustive.rs b/src/test/ui/tuple/tuple-struct-nonexhaustive.rs index e4fda6dd534..76bcf3fbd4d 100644 --- a/src/test/ui/tuple/tuple-struct-nonexhaustive.rs +++ b/src/test/ui/tuple/tuple-struct-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. - struct Foo(isize, isize); fn main() { diff --git a/src/test/ui/tuple/tuple-struct-nonexhaustive.stderr b/src/test/ui/tuple/tuple-struct-nonexhaustive.stderr index ee274bedbb8..8d627fc2a8d 100644 --- a/src/test/ui/tuple/tuple-struct-nonexhaustive.stderr +++ b/src/test/ui/tuple/tuple-struct-nonexhaustive.stderr @@ -1,5 +1,5 @@ error[E0004]: non-exhaustive patterns: `Foo(_, _)` not covered - --> $DIR/tuple-struct-nonexhaustive.rs:15:11 + --> $DIR/tuple-struct-nonexhaustive.rs:5:11 | LL | match x { //~ ERROR non-exhaustive | ^ pattern `Foo(_, _)` not covered |
