diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2018-12-25 08:56:47 -0700 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2018-12-25 21:08:33 -0700 |
| commit | 2a663555ddf36f6b041445894a8c175cd1bc718c (patch) | |
| tree | 98a0185efa6c05885b8d75c76d65880d514ff8d3 /src/test/ui/enum | |
| parent | 14b96659e4e9b2f31431df48f47c219957e2666a (diff) | |
| download | rust-2a663555ddf36f6b041445894a8c175cd1bc718c.tar.gz rust-2a663555ddf36f6b041445894a8c175cd1bc718c.zip | |
Remove licenses
Diffstat (limited to 'src/test/ui/enum')
| -rw-r--r-- | src/test/ui/enum/enum-and-module-in-same-scope.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/enum/enum-and-module-in-same-scope.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/enum/enum-discrim-autosizing.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/enum/enum-discrim-autosizing.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/enum/enum-discrim-too-small.rs | 11 | ||||
| -rw-r--r-- | src/test/ui/enum/enum-discrim-too-small.stderr | 8 | ||||
| -rw-r--r-- | src/test/ui/enum/enum-discrim-too-small2.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/enum/enum-discrim-too-small2.stderr | 10 | ||||
| -rw-r--r-- | src/test/ui/enum/enum-in-scope.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/enum/enum-in-scope.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/enum/enum-size-variance.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/enum/enum-size-variance.stderr | 4 | ||||
| -rw-r--r-- | src/test/ui/enum/enum-to-float-cast-2.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/enum/enum-to-float-cast-2.stderr | 4 | ||||
| -rw-r--r-- | src/test/ui/enum/enum-to-float-cast.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/enum/enum-to-float-cast.stderr | 4 | ||||
| -rw-r--r-- | src/test/ui/enum/enum-variant-type-2.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/enum/enum-variant-type-2.stderr | 2 |
18 files changed, 19 insertions, 110 deletions
diff --git a/src/test/ui/enum/enum-and-module-in-same-scope.rs b/src/test/ui/enum/enum-and-module-in-same-scope.rs index 9b6c8712f69..cc6e199bd7c 100644 --- a/src/test/ui/enum/enum-and-module-in-same-scope.rs +++ b/src/test/ui/enum/enum-and-module-in-same-scope.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. - enum Foo { X } diff --git a/src/test/ui/enum/enum-and-module-in-same-scope.stderr b/src/test/ui/enum/enum-and-module-in-same-scope.stderr index 230872abe0b..5f42af8f260 100644 --- a/src/test/ui/enum/enum-and-module-in-same-scope.stderr +++ b/src/test/ui/enum/enum-and-module-in-same-scope.stderr @@ -1,5 +1,5 @@ error[E0428]: the name `Foo` is defined multiple times - --> $DIR/enum-and-module-in-same-scope.rs:15:1 + --> $DIR/enum-and-module-in-same-scope.rs:5:1 | LL | enum Foo { | -------- previous definition of the type `Foo` here diff --git a/src/test/ui/enum/enum-discrim-autosizing.rs b/src/test/ui/enum/enum-discrim-autosizing.rs index dab22de1b6e..e9bb9275971 100644 --- a/src/test/ui/enum/enum-discrim-autosizing.rs +++ b/src/test/ui/enum/enum-discrim-autosizing.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. - // With no repr attribute the discriminant will default to isize. // On 32-bit architectures this is equivalent to i32 so the variants // collide. On other architectures we need compilation to fail anyway, diff --git a/src/test/ui/enum/enum-discrim-autosizing.stderr b/src/test/ui/enum/enum-discrim-autosizing.stderr index e4419d62851..67b0d75d787 100644 --- a/src/test/ui/enum/enum-discrim-autosizing.stderr +++ b/src/test/ui/enum/enum-discrim-autosizing.stderr @@ -1,5 +1,5 @@ error[E0081]: discriminant value `0` already exists - --> $DIR/enum-discrim-autosizing.rs:18:12 + --> $DIR/enum-discrim-autosizing.rs:8:12 | LL | Au64 = 0, | - first use of `0` diff --git a/src/test/ui/enum/enum-discrim-too-small.rs b/src/test/ui/enum/enum-discrim-too-small.rs index 393a67be57f..e498414020b 100644 --- a/src/test/ui/enum/enum-discrim-too-small.rs +++ b/src/test/ui/enum/enum-discrim-too-small.rs @@ -1,14 +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. - - #[repr(u8)] enum Eu8 { Au8 = 23, diff --git a/src/test/ui/enum/enum-discrim-too-small.stderr b/src/test/ui/enum/enum-discrim-too-small.stderr index 4c8ff52c12b..40205d95b1f 100644 --- a/src/test/ui/enum/enum-discrim-too-small.stderr +++ b/src/test/ui/enum/enum-discrim-too-small.stderr @@ -1,5 +1,5 @@ error[E0600]: cannot apply unary operator `-` to type `u8` - --> $DIR/enum-discrim-too-small.rs:16:11 + --> $DIR/enum-discrim-too-small.rs:5:11 | LL | Cu8 = -23, | ^^^ cannot apply unary operator `-` @@ -7,7 +7,7 @@ LL | Cu8 = -23, = note: unsigned values cannot be negated error[E0600]: cannot apply unary operator `-` to type `u16` - --> $DIR/enum-discrim-too-small.rs:24:12 + --> $DIR/enum-discrim-too-small.rs:13:12 | LL | Cu16 = -22333, | ^^^^^^ cannot apply unary operator `-` @@ -15,7 +15,7 @@ LL | Cu16 = -22333, = note: unsigned values cannot be negated error[E0600]: cannot apply unary operator `-` to type `u32` - --> $DIR/enum-discrim-too-small.rs:32:12 + --> $DIR/enum-discrim-too-small.rs:21:12 | LL | Cu32 = -2_000_000_000, | ^^^^^^^^^^^^^^ cannot apply unary operator `-` @@ -23,7 +23,7 @@ LL | Cu32 = -2_000_000_000, = note: unsigned values cannot be negated error[E0600]: cannot apply unary operator `-` to type `u64` - --> $DIR/enum-discrim-too-small.rs:40:12 + --> $DIR/enum-discrim-too-small.rs:29:12 | LL | Cu32 = -2_000_000_000, | ^^^^^^^^^^^^^^ cannot apply unary operator `-` diff --git a/src/test/ui/enum/enum-discrim-too-small2.rs b/src/test/ui/enum/enum-discrim-too-small2.rs index d66716c14c3..af605643025 100644 --- a/src/test/ui/enum/enum-discrim-too-small2.rs +++ b/src/test/ui/enum/enum-discrim-too-small2.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. - #![deny(overflowing_literals)] #![allow(dead_code)] diff --git a/src/test/ui/enum/enum-discrim-too-small2.stderr b/src/test/ui/enum/enum-discrim-too-small2.stderr index 536dbf64a9d..31ca01b86bd 100644 --- a/src/test/ui/enum/enum-discrim-too-small2.stderr +++ b/src/test/ui/enum/enum-discrim-too-small2.stderr @@ -1,29 +1,29 @@ error: literal out of range for i8 - --> $DIR/enum-discrim-too-small2.rs:18:11 + --> $DIR/enum-discrim-too-small2.rs:8:11 | LL | Ci8 = 223, //~ ERROR literal out of range for i8 | ^^^ | note: lint level defined here - --> $DIR/enum-discrim-too-small2.rs:11:9 + --> $DIR/enum-discrim-too-small2.rs:1:9 | LL | #![deny(overflowing_literals)] | ^^^^^^^^^^^^^^^^^^^^ error: literal out of range for i16 - --> $DIR/enum-discrim-too-small2.rs:25:12 + --> $DIR/enum-discrim-too-small2.rs:15:12 | LL | Ci16 = 55555, //~ ERROR literal out of range for i16 | ^^^^^ error: literal out of range for i32 - --> $DIR/enum-discrim-too-small2.rs:32:12 + --> $DIR/enum-discrim-too-small2.rs:22:12 | LL | Ci32 = 3_000_000_000, //~ ERROR literal out of range for i32 | ^^^^^^^^^^^^^ error: literal out of range for i64 - --> $DIR/enum-discrim-too-small2.rs:39:12 + --> $DIR/enum-discrim-too-small2.rs:29:12 | LL | Ci64 = 9223372036854775809, //~ ERROR literal out of range for i64 | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/enum/enum-in-scope.rs b/src/test/ui/enum/enum-in-scope.rs index d0c737c05d0..df14bc62e76 100644 --- a/src/test/ui/enum/enum-in-scope.rs +++ b/src/test/ui/enum/enum-in-scope.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. - #![allow(non_camel_case_types)] struct hello(isize); diff --git a/src/test/ui/enum/enum-in-scope.stderr b/src/test/ui/enum/enum-in-scope.stderr index 36a5ca9768d..cd0100ec2fc 100644 --- a/src/test/ui/enum/enum-in-scope.stderr +++ b/src/test/ui/enum/enum-in-scope.stderr @@ -1,5 +1,5 @@ error[E0530]: let bindings cannot shadow tuple structs - --> $DIR/enum-in-scope.rs:16:9 + --> $DIR/enum-in-scope.rs:6:9 | LL | struct hello(isize); | -------------------- the tuple struct `hello` is defined here diff --git a/src/test/ui/enum/enum-size-variance.rs b/src/test/ui/enum/enum-size-variance.rs index 582998a986d..082bd0dcfb2 100644 --- a/src/test/ui/enum/enum-size-variance.rs +++ b/src/test/ui/enum/enum-size-variance.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. - // run-pass #![warn(variant_size_differences)] diff --git a/src/test/ui/enum/enum-size-variance.stderr b/src/test/ui/enum/enum-size-variance.stderr index f6df65b1d9d..5cc0a0d7a8f 100644 --- a/src/test/ui/enum/enum-size-variance.stderr +++ b/src/test/ui/enum/enum-size-variance.stderr @@ -1,11 +1,11 @@ warning: enum variant is more than three times larger (32 bytes) than the next largest - --> $DIR/enum-size-variance.rs:28:5 + --> $DIR/enum-size-variance.rs:18:5 | LL | L(i64, i64, i64, i64), //~ WARNING three times larger | ^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/enum-size-variance.rs:13:9 + --> $DIR/enum-size-variance.rs:3:9 | LL | #![warn(variant_size_differences)] | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/enum/enum-to-float-cast-2.rs b/src/test/ui/enum/enum-to-float-cast-2.rs index e6f473c8aac..c861b5ed9ff 100644 --- a/src/test/ui/enum/enum-to-float-cast-2.rs +++ b/src/test/ui/enum/enum-to-float-cast-2.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. - // Tests that enum-to-float casts are disallowed. enum E { diff --git a/src/test/ui/enum/enum-to-float-cast-2.stderr b/src/test/ui/enum/enum-to-float-cast-2.stderr index e8e6d8fbcfb..42d08a11ed1 100644 --- a/src/test/ui/enum/enum-to-float-cast-2.stderr +++ b/src/test/ui/enum/enum-to-float-cast-2.stderr @@ -1,5 +1,5 @@ error[E0606]: casting `E` as `f32` is invalid - --> $DIR/enum-to-float-cast-2.rs:24:13 + --> $DIR/enum-to-float-cast-2.rs:14:13 | LL | let a = E::L0 as f32; //~ ERROR casting | ^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | let a = E::L0 as f32; //~ ERROR casting = help: cast through an integer first error[E0606]: casting `F` as `f32` is invalid - --> $DIR/enum-to-float-cast-2.rs:25:13 + --> $DIR/enum-to-float-cast-2.rs:15:13 | LL | let c = F::H1 as f32; //~ ERROR casting | ^^^^^^^^^^^^ diff --git a/src/test/ui/enum/enum-to-float-cast.rs b/src/test/ui/enum/enum-to-float-cast.rs index b562ba0e41a..05acdfd34e2 100644 --- a/src/test/ui/enum/enum-to-float-cast.rs +++ b/src/test/ui/enum/enum-to-float-cast.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. - // Tests that enum-to-float casts are disallowed. enum E { diff --git a/src/test/ui/enum/enum-to-float-cast.stderr b/src/test/ui/enum/enum-to-float-cast.stderr index adc2015909c..e6cd2ed4d0d 100644 --- a/src/test/ui/enum/enum-to-float-cast.stderr +++ b/src/test/ui/enum/enum-to-float-cast.stderr @@ -1,5 +1,5 @@ error[E0606]: casting `E` as `f32` is invalid - --> $DIR/enum-to-float-cast.rs:23:18 + --> $DIR/enum-to-float-cast.rs:13:18 | LL | static C0: f32 = E::L0 as f32; //~ ERROR casting | ^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | static C0: f32 = E::L0 as f32; //~ ERROR casting = help: cast through an integer first error[E0606]: casting `F` as `f32` is invalid - --> $DIR/enum-to-float-cast.rs:24:18 + --> $DIR/enum-to-float-cast.rs:14:18 | LL | static C1: f32 = F::H1 as f32; //~ ERROR casting | ^^^^^^^^^^^^ diff --git a/src/test/ui/enum/enum-variant-type-2.rs b/src/test/ui/enum/enum-variant-type-2.rs index 258bfd1e3ba..27286a0a3dd 100644 --- a/src/test/ui/enum/enum-variant-type-2.rs +++ b/src/test/ui/enum/enum-variant-type-2.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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. - // Test that enum variants are not actually types. enum Foo { diff --git a/src/test/ui/enum/enum-variant-type-2.stderr b/src/test/ui/enum/enum-variant-type-2.stderr index eb869f5539f..3e7a4edd66e 100644 --- a/src/test/ui/enum/enum-variant-type-2.stderr +++ b/src/test/ui/enum/enum-variant-type-2.stderr @@ -1,5 +1,5 @@ error[E0573]: expected type, found variant `Foo::Bar` - --> $DIR/enum-variant-type-2.rs:17:11 + --> $DIR/enum-variant-type-2.rs:7:11 | LL | fn foo(x: Foo::Bar) {} //~ ERROR expected type, found variant `Foo::Bar` | ^^^^^^^^ |
