diff options
Diffstat (limited to 'src/test/ui/pattern')
20 files changed, 26 insertions, 126 deletions
diff --git a/src/test/ui/pattern/pat-shadow-in-nested-binding.rs b/src/test/ui/pattern/pat-shadow-in-nested-binding.rs index c3b88971155..7badbb6b95c 100644 --- a/src/test/ui/pattern/pat-shadow-in-nested-binding.rs +++ b/src/test/ui/pattern/pat-shadow-in-nested-binding.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 foo(usize); diff --git a/src/test/ui/pattern/pat-shadow-in-nested-binding.stderr b/src/test/ui/pattern/pat-shadow-in-nested-binding.stderr index 51f2094dc19..7dbe23a8f28 100644 --- a/src/test/ui/pattern/pat-shadow-in-nested-binding.stderr +++ b/src/test/ui/pattern/pat-shadow-in-nested-binding.stderr @@ -1,5 +1,5 @@ error[E0530]: let bindings cannot shadow tuple structs - --> $DIR/pat-shadow-in-nested-binding.rs:15:10 + --> $DIR/pat-shadow-in-nested-binding.rs:5:10 | LL | struct foo(usize); | ------------------ the tuple struct `foo` is defined here diff --git a/src/test/ui/pattern/pat-tuple-bad-type.rs b/src/test/ui/pattern/pat-tuple-bad-type.rs index 251e7b47dcc..01e793e8685 100644 --- a/src/test/ui/pattern/pat-tuple-bad-type.rs +++ b/src/test/ui/pattern/pat-tuple-bad-type.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. - fn main() { let x; diff --git a/src/test/ui/pattern/pat-tuple-bad-type.stderr b/src/test/ui/pattern/pat-tuple-bad-type.stderr index d4f80550b3e..28aa52856c5 100644 --- a/src/test/ui/pattern/pat-tuple-bad-type.stderr +++ b/src/test/ui/pattern/pat-tuple-bad-type.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/pat-tuple-bad-type.rs:15:9 + --> $DIR/pat-tuple-bad-type.rs:5:9 | LL | let x; | - consider giving `x` a type @@ -10,7 +10,7 @@ LL | (..) => {} //~ ERROR type annotations needed = note: type must be known at this point error[E0308]: mismatched types - --> $DIR/pat-tuple-bad-type.rs:20:9 + --> $DIR/pat-tuple-bad-type.rs:10:9 | LL | (..) => {} //~ ERROR mismatched types | ^^^^ expected u8, found () diff --git a/src/test/ui/pattern/pat-tuple-overfield.rs b/src/test/ui/pattern/pat-tuple-overfield.rs index 851fa5c5be6..46a5e15ffa5 100644 --- a/src/test/ui/pattern/pat-tuple-overfield.rs +++ b/src/test/ui/pattern/pat-tuple-overfield.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. - struct S(u8, u8, u8); fn main() { diff --git a/src/test/ui/pattern/pat-tuple-overfield.stderr b/src/test/ui/pattern/pat-tuple-overfield.stderr index 2802b42f313..4bd374affb3 100644 --- a/src/test/ui/pattern/pat-tuple-overfield.stderr +++ b/src/test/ui/pattern/pat-tuple-overfield.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/pat-tuple-overfield.rs:15:9 + --> $DIR/pat-tuple-overfield.rs:5:9 | LL | (1, 2, 3, 4) => {} //~ ERROR mismatched types | ^^^^^^^^^^^^ expected a tuple with 3 elements, found one with 4 elements @@ -8,7 +8,7 @@ LL | (1, 2, 3, 4) => {} //~ ERROR mismatched types found type `(_, _, _, _)` error[E0308]: mismatched types - --> $DIR/pat-tuple-overfield.rs:16:9 + --> $DIR/pat-tuple-overfield.rs:6:9 | LL | (1, 2, .., 3, 4) => {} //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^ expected a tuple with 3 elements, found one with 4 elements @@ -17,13 +17,13 @@ LL | (1, 2, .., 3, 4) => {} //~ ERROR mismatched types found type `(_, _, _, _)` error[E0023]: this pattern has 4 fields, but the corresponding tuple struct has 3 fields - --> $DIR/pat-tuple-overfield.rs:20:9 + --> $DIR/pat-tuple-overfield.rs:10:9 | LL | S(1, 2, 3, 4) => {} | ^^^^^^^^^^^^^ expected 3 fields, found 4 error[E0023]: this pattern has 4 fields, but the corresponding tuple struct has 3 fields - --> $DIR/pat-tuple-overfield.rs:22:9 + --> $DIR/pat-tuple-overfield.rs:12:9 | LL | S(1, 2, .., 3, 4) => {} | ^^^^^^^^^^^^^^^^^ expected 3 fields, found 4 diff --git a/src/test/ui/pattern/patkind-litrange-no-expr.rs b/src/test/ui/pattern/patkind-litrange-no-expr.rs index 8fef98f815f..def6c62459e 100644 --- a/src/test/ui/pattern/patkind-litrange-no-expr.rs +++ b/src/test/ui/pattern/patkind-litrange-no-expr.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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! enum_number { ($name:ident { $($variant:ident = $value:expr, )* }) => { enum $name { diff --git a/src/test/ui/pattern/patkind-litrange-no-expr.stderr b/src/test/ui/pattern/patkind-litrange-no-expr.stderr index f22870fb029..4caafa7d3e8 100644 --- a/src/test/ui/pattern/patkind-litrange-no-expr.stderr +++ b/src/test/ui/pattern/patkind-litrange-no-expr.stderr @@ -1,11 +1,11 @@ error: arbitrary expressions aren't allowed in patterns - --> $DIR/patkind-litrange-no-expr.rs:30:13 + --> $DIR/patkind-litrange-no-expr.rs:20:13 | LL | Arith = 1 + 1, //~ ERROR arbitrary expressions aren't allowed in patterns | ^^^^^ error[E0029]: only char and numeric types are allowed in range patterns - --> $DIR/patkind-litrange-no-expr.rs:30:13 + --> $DIR/patkind-litrange-no-expr.rs:20:13 | LL | Arith = 1 + 1, //~ ERROR arbitrary expressions aren't allowed in patterns | ^^^^^ ranges require char or numeric types diff --git a/src/test/ui/pattern/pattern-binding-disambiguation.rs b/src/test/ui/pattern/pattern-binding-disambiguation.rs index c740f6bb47c..2e80ea345dc 100644 --- a/src/test/ui/pattern/pattern-binding-disambiguation.rs +++ b/src/test/ui/pattern/pattern-binding-disambiguation.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 UnitStruct; struct TupleStruct(); struct BracedStruct{} diff --git a/src/test/ui/pattern/pattern-binding-disambiguation.stderr b/src/test/ui/pattern/pattern-binding-disambiguation.stderr index 5d14610b8a1..958934c301f 100644 --- a/src/test/ui/pattern/pattern-binding-disambiguation.stderr +++ b/src/test/ui/pattern/pattern-binding-disambiguation.stderr @@ -1,5 +1,5 @@ error[E0530]: match bindings cannot shadow tuple structs - --> $DIR/pattern-binding-disambiguation.rs:34:9 + --> $DIR/pattern-binding-disambiguation.rs:24:9 | LL | struct TupleStruct(); | --------------------- the tuple struct `TupleStruct` is defined here @@ -8,7 +8,7 @@ LL | TupleStruct => {} //~ ERROR match bindings cannot shadow tuple stru | ^^^^^^^^^^^ cannot be named the same as a tuple struct error[E0530]: match bindings cannot shadow tuple variants - --> $DIR/pattern-binding-disambiguation.rs:43:9 + --> $DIR/pattern-binding-disambiguation.rs:33:9 | LL | use E::*; | ---- the tuple variant `TupleVariant` is imported here @@ -17,7 +17,7 @@ LL | TupleVariant => {} //~ ERROR match bindings cannot shadow tuple var | ^^^^^^^^^^^^ cannot be named the same as a tuple variant error[E0530]: match bindings cannot shadow struct variants - --> $DIR/pattern-binding-disambiguation.rs:46:9 + --> $DIR/pattern-binding-disambiguation.rs:36:9 | LL | use E::*; | ---- the struct variant `BracedVariant` is imported here @@ -26,7 +26,7 @@ LL | BracedVariant => {} //~ ERROR match bindings cannot shadow struct v | ^^^^^^^^^^^^^ cannot be named the same as a struct variant error[E0530]: match bindings cannot shadow statics - --> $DIR/pattern-binding-disambiguation.rs:52:9 + --> $DIR/pattern-binding-disambiguation.rs:42:9 | LL | static STATIC: () = (); | ----------------------- the static `STATIC` is defined here @@ -35,7 +35,7 @@ LL | STATIC => {} //~ ERROR match bindings cannot shadow statics | ^^^^^^ cannot be named the same as a static error[E0530]: let bindings cannot shadow tuple structs - --> $DIR/pattern-binding-disambiguation.rs:59:9 + --> $DIR/pattern-binding-disambiguation.rs:49:9 | LL | struct TupleStruct(); | --------------------- the tuple struct `TupleStruct` is defined here @@ -44,7 +44,7 @@ LL | let TupleStruct = doesnt_matter; //~ ERROR let bindings cannot shadow t | ^^^^^^^^^^^ cannot be named the same as a tuple struct error[E0530]: let bindings cannot shadow tuple variants - --> $DIR/pattern-binding-disambiguation.rs:62:9 + --> $DIR/pattern-binding-disambiguation.rs:52:9 | LL | use E::*; | ---- the tuple variant `TupleVariant` is imported here @@ -53,7 +53,7 @@ LL | let TupleVariant = doesnt_matter; //~ ERROR let bindings cannot shadow | ^^^^^^^^^^^^ cannot be named the same as a tuple variant error[E0530]: let bindings cannot shadow struct variants - --> $DIR/pattern-binding-disambiguation.rs:63:9 + --> $DIR/pattern-binding-disambiguation.rs:53:9 | LL | use E::*; | ---- the struct variant `BracedVariant` is imported here @@ -62,7 +62,7 @@ LL | let BracedVariant = doesnt_matter; //~ ERROR let bindings cannot shadow | ^^^^^^^^^^^^^ cannot be named the same as a struct variant error[E0530]: let bindings cannot shadow statics - --> $DIR/pattern-binding-disambiguation.rs:65:9 + --> $DIR/pattern-binding-disambiguation.rs:55:9 | LL | static STATIC: () = (); | ----------------------- the static `STATIC` is defined here diff --git a/src/test/ui/pattern/pattern-bindings-after-at.rs b/src/test/ui/pattern/pattern-bindings-after-at.rs index da2a97b0ca8..4a24a496857 100644 --- a/src/test/ui/pattern/pattern-bindings-after-at.rs +++ b/src/test/ui/pattern/pattern-bindings-after-at.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 Option<T> { None, Some(T), diff --git a/src/test/ui/pattern/pattern-bindings-after-at.stderr b/src/test/ui/pattern/pattern-bindings-after-at.stderr index 8c715001baa..7a3883c5854 100644 --- a/src/test/ui/pattern/pattern-bindings-after-at.stderr +++ b/src/test/ui/pattern/pattern-bindings-after-at.stderr @@ -1,5 +1,5 @@ error[E0303]: pattern bindings are not allowed after an `@` - --> $DIR/pattern-bindings-after-at.rs:18:31 + --> $DIR/pattern-bindings-after-at.rs:8:31 | LL | ref mut z @ &mut Some(ref a) => { | ^^^^^ not allowed after `@` diff --git a/src/test/ui/pattern/pattern-error-continue.rs b/src/test/ui/pattern/pattern-error-continue.rs index c544ca4e304..7e79868f874 100644 --- a/src/test/ui/pattern/pattern-error-continue.rs +++ b/src/test/ui/pattern/pattern-error-continue.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. - // Test that certain pattern-match type errors are non-fatal enum A { diff --git a/src/test/ui/pattern/pattern-error-continue.stderr b/src/test/ui/pattern/pattern-error-continue.stderr index f2c35ef872d..c17d4b70f0b 100644 --- a/src/test/ui/pattern/pattern-error-continue.stderr +++ b/src/test/ui/pattern/pattern-error-continue.stderr @@ -1,11 +1,11 @@ error[E0433]: failed to resolve: use of undeclared type or module `E` - --> $DIR/pattern-error-continue.rs:45:9 + --> $DIR/pattern-error-continue.rs:35:9 | LL | E::V => {} //~ ERROR failed to resolve: use of undeclared type or module `E` | ^ use of undeclared type or module `E` error[E0532]: expected tuple struct/variant, found unit variant `A::D` - --> $DIR/pattern-error-continue.rs:28:9 + --> $DIR/pattern-error-continue.rs:18:9 | LL | A::D(_) => (), //~ ERROR expected tuple struct/variant, found unit variant `A::D` | ^^^- @@ -13,13 +13,13 @@ LL | A::D(_) => (), //~ ERROR expected tuple struct/variant, found | did you mean `B`? error[E0023]: this pattern has 3 fields, but the corresponding tuple variant has 2 fields - --> $DIR/pattern-error-continue.rs:27:9 + --> $DIR/pattern-error-continue.rs:17:9 | LL | A::B(_, _, _) => (), //~ ERROR this pattern has 3 fields, but | ^^^^^^^^^^^^^ expected 2 fields, found 3 error[E0308]: mismatched types - --> $DIR/pattern-error-continue.rs:32:9 + --> $DIR/pattern-error-continue.rs:22:9 | LL | S { .. } => (), | ^^^^^^^^ expected char, found struct `S` @@ -28,7 +28,7 @@ LL | S { .. } => (), found type `S` error[E0308]: mismatched types - --> $DIR/pattern-error-continue.rs:40:7 + --> $DIR/pattern-error-continue.rs:30:7 | LL | f(true); | ^^^^ expected char, found bool diff --git a/src/test/ui/pattern/pattern-ident-path-generics.rs b/src/test/ui/pattern/pattern-ident-path-generics.rs index 0b7886842b4..48c02623f28 100644 --- a/src/test/ui/pattern/pattern-ident-path-generics.rs +++ b/src/test/ui/pattern/pattern-ident-path-generics.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. - fn main() { match Some("foo") { None::<isize> => {} //~ ERROR mismatched types diff --git a/src/test/ui/pattern/pattern-ident-path-generics.stderr b/src/test/ui/pattern/pattern-ident-path-generics.stderr index cd205956571..278b3d19d8b 100644 --- a/src/test/ui/pattern/pattern-ident-path-generics.stderr +++ b/src/test/ui/pattern/pattern-ident-path-generics.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/pattern-ident-path-generics.rs:13:9 + --> $DIR/pattern-ident-path-generics.rs:3:9 | LL | None::<isize> => {} //~ ERROR mismatched types | ^^^^^^^^^^^^^ expected &str, found isize diff --git a/src/test/ui/pattern/pattern-tyvar-2.rs b/src/test/ui/pattern/pattern-tyvar-2.rs index 25d34d7b3b3..9fba9cb876a 100644 --- a/src/test/ui/pattern/pattern-tyvar-2.rs +++ b/src/test/ui/pattern/pattern-tyvar-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. - enum Bar { T1((), Option<Vec<isize>>), T2, } fn foo(t: Bar) -> isize { match t { Bar::T1(_, Some(x)) => { return x * 3; } _ => { panic!(); } } } diff --git a/src/test/ui/pattern/pattern-tyvar-2.stderr b/src/test/ui/pattern/pattern-tyvar-2.stderr index 3544e01ef66..5218dd916a5 100644 --- a/src/test/ui/pattern/pattern-tyvar-2.stderr +++ b/src/test/ui/pattern/pattern-tyvar-2.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `*` cannot be applied to type `std::vec::Vec<isize>` - --> $DIR/pattern-tyvar-2.rs:13:69 + --> $DIR/pattern-tyvar-2.rs:3:69 | LL | fn foo(t: Bar) -> isize { match t { Bar::T1(_, Some(x)) => { return x * 3; } _ => { panic!(); } } } | ^^^^^ diff --git a/src/test/ui/pattern/pattern-tyvar.rs b/src/test/ui/pattern/pattern-tyvar.rs index 505bacf2fee..e2cbf05193d 100644 --- a/src/test/ui/pattern/pattern-tyvar.rs +++ b/src/test/ui/pattern/pattern-tyvar.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 Bar { T1((), Option<Vec<isize>>), T2 } fn foo(t: Bar) { diff --git a/src/test/ui/pattern/pattern-tyvar.stderr b/src/test/ui/pattern/pattern-tyvar.stderr index 3b98e9a52f7..dae17fa5166 100644 --- a/src/test/ui/pattern/pattern-tyvar.stderr +++ b/src/test/ui/pattern/pattern-tyvar.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/pattern-tyvar.rs:15:18 + --> $DIR/pattern-tyvar.rs:5:18 | LL | Bar::T1(_, Some::<isize>(x)) => { //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^ expected struct `std::vec::Vec`, found isize |