From 3f7c7842e6dd0dfc713c52fe7ffd24cd6a54fa87 Mon Sep 17 00:00:00 2001 From: clubby789 Date: Wed, 17 Jan 2024 15:59:04 +0000 Subject: Move `removed-syntax` tests to their own directory --- tests/ui/parser/removed-syntax-box.fixed | 14 ------ tests/ui/parser/removed-syntax-box.rs | 14 ------ tests/ui/parser/removed-syntax-box.stderr | 57 ---------------------- tests/ui/parser/removed-syntax-closure-lifetime.rs | 2 - .../parser/removed-syntax-closure-lifetime.stderr | 13 ----- tests/ui/parser/removed-syntax-enum-newtype.rs | 1 - tests/ui/parser/removed-syntax-enum-newtype.stderr | 10 ---- tests/ui/parser/removed-syntax-field-let-2.rs | 12 ----- tests/ui/parser/removed-syntax-field-let-2.stderr | 33 ------------- tests/ui/parser/removed-syntax-field-let.rs | 6 --- tests/ui/parser/removed-syntax-field-let.stderr | 14 ------ tests/ui/parser/removed-syntax-field-semicolon.rs | 6 --- .../parser/removed-syntax-field-semicolon.stderr | 10 ---- tests/ui/parser/removed-syntax-fixed-vec.rs | 1 - tests/ui/parser/removed-syntax-fixed-vec.stderr | 8 --- tests/ui/parser/removed-syntax-fn-sigil.rs | 4 -- tests/ui/parser/removed-syntax-fn-sigil.stderr | 14 ------ tests/ui/parser/removed-syntax-mode.rs | 4 -- tests/ui/parser/removed-syntax-mode.stderr | 8 --- tests/ui/parser/removed-syntax-mut-vec-expr.rs | 3 -- tests/ui/parser/removed-syntax-mut-vec-expr.stderr | 8 --- tests/ui/parser/removed-syntax-mut-vec-ty.rs | 1 - tests/ui/parser/removed-syntax-mut-vec-ty.stderr | 8 --- tests/ui/parser/removed-syntax-ptr-lifetime.rs | 1 - tests/ui/parser/removed-syntax-ptr-lifetime.stderr | 8 --- tests/ui/parser/removed-syntax-record.rs | 1 - tests/ui/parser/removed-syntax-record.stderr | 8 --- tests/ui/parser/removed-syntax-static-fn.rs | 10 ---- tests/ui/parser/removed-syntax-static-fn.stderr | 25 ---------- tests/ui/parser/removed-syntax-uniq-mut-expr.rs | 3 -- .../ui/parser/removed-syntax-uniq-mut-expr.stderr | 8 --- tests/ui/parser/removed-syntax-uniq-mut-ty.rs | 2 - tests/ui/parser/removed-syntax-uniq-mut-ty.stderr | 8 --- tests/ui/parser/removed-syntax-with-1.rs | 10 ---- tests/ui/parser/removed-syntax-with-1.stderr | 11 ----- tests/ui/parser/removed-syntax-with-2.rs | 11 ----- tests/ui/parser/removed-syntax-with-2.stderr | 18 ------- .../parser/removed-syntax/removed-syntax-box.fixed | 14 ++++++ .../ui/parser/removed-syntax/removed-syntax-box.rs | 14 ++++++ .../removed-syntax/removed-syntax-box.stderr | 57 ++++++++++++++++++++++ .../removed-syntax-closure-lifetime.rs | 2 + .../removed-syntax-closure-lifetime.stderr | 13 +++++ .../removed-syntax/removed-syntax-enum-newtype.rs | 1 + .../removed-syntax-enum-newtype.stderr | 10 ++++ .../removed-syntax/removed-syntax-field-let-2.rs | 12 +++++ .../removed-syntax-field-let-2.stderr | 33 +++++++++++++ .../removed-syntax/removed-syntax-field-let.rs | 6 +++ .../removed-syntax/removed-syntax-field-let.stderr | 14 ++++++ .../removed-syntax-field-semicolon.rs | 6 +++ .../removed-syntax-field-semicolon.stderr | 10 ++++ .../removed-syntax/removed-syntax-fixed-vec.rs | 1 + .../removed-syntax/removed-syntax-fixed-vec.stderr | 8 +++ .../removed-syntax/removed-syntax-fn-sigil.rs | 4 ++ .../removed-syntax/removed-syntax-fn-sigil.stderr | 14 ++++++ .../parser/removed-syntax/removed-syntax-mode.rs | 4 ++ .../removed-syntax/removed-syntax-mode.stderr | 8 +++ .../removed-syntax/removed-syntax-mut-vec-expr.rs | 3 ++ .../removed-syntax-mut-vec-expr.stderr | 8 +++ .../removed-syntax/removed-syntax-mut-vec-ty.rs | 1 + .../removed-syntax-mut-vec-ty.stderr | 8 +++ .../removed-syntax/removed-syntax-ptr-lifetime.rs | 1 + .../removed-syntax-ptr-lifetime.stderr | 8 +++ .../parser/removed-syntax/removed-syntax-record.rs | 1 + .../removed-syntax/removed-syntax-record.stderr | 8 +++ .../removed-syntax/removed-syntax-static-fn.rs | 10 ++++ .../removed-syntax/removed-syntax-static-fn.stderr | 25 ++++++++++ .../removed-syntax/removed-syntax-uniq-mut-expr.rs | 3 ++ .../removed-syntax-uniq-mut-expr.stderr | 8 +++ .../removed-syntax/removed-syntax-uniq-mut-ty.rs | 2 + .../removed-syntax-uniq-mut-ty.stderr | 8 +++ .../parser/removed-syntax/removed-syntax-with-1.rs | 10 ++++ .../removed-syntax/removed-syntax-with-1.stderr | 11 +++++ .../parser/removed-syntax/removed-syntax-with-2.rs | 11 +++++ .../removed-syntax/removed-syntax-with-2.stderr | 18 +++++++ 74 files changed, 375 insertions(+), 375 deletions(-) delete mode 100644 tests/ui/parser/removed-syntax-box.fixed delete mode 100644 tests/ui/parser/removed-syntax-box.rs delete mode 100644 tests/ui/parser/removed-syntax-box.stderr delete mode 100644 tests/ui/parser/removed-syntax-closure-lifetime.rs delete mode 100644 tests/ui/parser/removed-syntax-closure-lifetime.stderr delete mode 100644 tests/ui/parser/removed-syntax-enum-newtype.rs delete mode 100644 tests/ui/parser/removed-syntax-enum-newtype.stderr delete mode 100644 tests/ui/parser/removed-syntax-field-let-2.rs delete mode 100644 tests/ui/parser/removed-syntax-field-let-2.stderr delete mode 100644 tests/ui/parser/removed-syntax-field-let.rs delete mode 100644 tests/ui/parser/removed-syntax-field-let.stderr delete mode 100644 tests/ui/parser/removed-syntax-field-semicolon.rs delete mode 100644 tests/ui/parser/removed-syntax-field-semicolon.stderr delete mode 100644 tests/ui/parser/removed-syntax-fixed-vec.rs delete mode 100644 tests/ui/parser/removed-syntax-fixed-vec.stderr delete mode 100644 tests/ui/parser/removed-syntax-fn-sigil.rs delete mode 100644 tests/ui/parser/removed-syntax-fn-sigil.stderr delete mode 100644 tests/ui/parser/removed-syntax-mode.rs delete mode 100644 tests/ui/parser/removed-syntax-mode.stderr delete mode 100644 tests/ui/parser/removed-syntax-mut-vec-expr.rs delete mode 100644 tests/ui/parser/removed-syntax-mut-vec-expr.stderr delete mode 100644 tests/ui/parser/removed-syntax-mut-vec-ty.rs delete mode 100644 tests/ui/parser/removed-syntax-mut-vec-ty.stderr delete mode 100644 tests/ui/parser/removed-syntax-ptr-lifetime.rs delete mode 100644 tests/ui/parser/removed-syntax-ptr-lifetime.stderr delete mode 100644 tests/ui/parser/removed-syntax-record.rs delete mode 100644 tests/ui/parser/removed-syntax-record.stderr delete mode 100644 tests/ui/parser/removed-syntax-static-fn.rs delete mode 100644 tests/ui/parser/removed-syntax-static-fn.stderr delete mode 100644 tests/ui/parser/removed-syntax-uniq-mut-expr.rs delete mode 100644 tests/ui/parser/removed-syntax-uniq-mut-expr.stderr delete mode 100644 tests/ui/parser/removed-syntax-uniq-mut-ty.rs delete mode 100644 tests/ui/parser/removed-syntax-uniq-mut-ty.stderr delete mode 100644 tests/ui/parser/removed-syntax-with-1.rs delete mode 100644 tests/ui/parser/removed-syntax-with-1.stderr delete mode 100644 tests/ui/parser/removed-syntax-with-2.rs delete mode 100644 tests/ui/parser/removed-syntax-with-2.stderr create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-box.fixed create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-box.rs create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-box.stderr create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-closure-lifetime.rs create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-closure-lifetime.stderr create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-enum-newtype.rs create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-enum-newtype.stderr create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-field-let-2.rs create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-field-let-2.stderr create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-field-let.rs create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-field-let.stderr create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-field-semicolon.rs create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-field-semicolon.stderr create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-fixed-vec.rs create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-fixed-vec.stderr create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-fn-sigil.rs create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-fn-sigil.stderr create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-mode.rs create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-mode.stderr create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-mut-vec-expr.rs create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-mut-vec-expr.stderr create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-mut-vec-ty.rs create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-mut-vec-ty.stderr create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-ptr-lifetime.rs create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-ptr-lifetime.stderr create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-record.rs create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-record.stderr create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-static-fn.rs create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-static-fn.stderr create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-uniq-mut-expr.rs create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-uniq-mut-expr.stderr create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-uniq-mut-ty.rs create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-uniq-mut-ty.stderr create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-with-1.rs create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-with-1.stderr create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-with-2.rs create mode 100644 tests/ui/parser/removed-syntax/removed-syntax-with-2.stderr (limited to 'tests/ui/parser') diff --git a/tests/ui/parser/removed-syntax-box.fixed b/tests/ui/parser/removed-syntax-box.fixed deleted file mode 100644 index 09d1304b775..00000000000 --- a/tests/ui/parser/removed-syntax-box.fixed +++ /dev/null @@ -1,14 +0,0 @@ -// run-rustfix - -fn main() { - #[allow(dead_code)] - struct T { - a: u8, - b: u8, - } - let _ = Box::new(()); //~ ERROR `box_syntax` has been removed - let _ = Box::new(1); //~ ERROR `box_syntax` has been removed - let _ = Box::new(T { a: 12, b: 18 }); //~ ERROR `box_syntax` has been removed - let _ = Box::new([5; 30]); //~ ERROR `box_syntax` has been removed - let _: Box<()> = Box::new(()); //~ ERROR `box_syntax` has been removed -} diff --git a/tests/ui/parser/removed-syntax-box.rs b/tests/ui/parser/removed-syntax-box.rs deleted file mode 100644 index 1f5061b02c7..00000000000 --- a/tests/ui/parser/removed-syntax-box.rs +++ /dev/null @@ -1,14 +0,0 @@ -// run-rustfix - -fn main() { - #[allow(dead_code)] - struct T { - a: u8, - b: u8, - } - let _ = box (); //~ ERROR `box_syntax` has been removed - let _ = box 1; //~ ERROR `box_syntax` has been removed - let _ = box T { a: 12, b: 18 }; //~ ERROR `box_syntax` has been removed - let _ = box [5; 30]; //~ ERROR `box_syntax` has been removed - let _: Box<()> = box (); //~ ERROR `box_syntax` has been removed -} diff --git a/tests/ui/parser/removed-syntax-box.stderr b/tests/ui/parser/removed-syntax-box.stderr deleted file mode 100644 index 46b891587d5..00000000000 --- a/tests/ui/parser/removed-syntax-box.stderr +++ /dev/null @@ -1,57 +0,0 @@ -error: `box_syntax` has been removed - --> $DIR/removed-syntax-box.rs:9:13 - | -LL | let _ = box (); - | ^^^^^^ - | -help: use `Box::new()` instead - | -LL | let _ = Box::new(()); - | ~~~~~~~~~~~~ - -error: `box_syntax` has been removed - --> $DIR/removed-syntax-box.rs:10:13 - | -LL | let _ = box 1; - | ^^^^^ - | -help: use `Box::new()` instead - | -LL | let _ = Box::new(1); - | ~~~~~~~~~~~ - -error: `box_syntax` has been removed - --> $DIR/removed-syntax-box.rs:11:13 - | -LL | let _ = box T { a: 12, b: 18 }; - | ^^^^^^^^^^^^^^^^^^^^^^ - | -help: use `Box::new()` instead - | -LL | let _ = Box::new(T { a: 12, b: 18 }); - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -error: `box_syntax` has been removed - --> $DIR/removed-syntax-box.rs:12:13 - | -LL | let _ = box [5; 30]; - | ^^^^^^^^^^^ - | -help: use `Box::new()` instead - | -LL | let _ = Box::new([5; 30]); - | ~~~~~~~~~~~~~~~~~ - -error: `box_syntax` has been removed - --> $DIR/removed-syntax-box.rs:13:22 - | -LL | let _: Box<()> = box (); - | ^^^^^^ - | -help: use `Box::new()` instead - | -LL | let _: Box<()> = Box::new(()); - | ~~~~~~~~~~~~ - -error: aborting due to 5 previous errors - diff --git a/tests/ui/parser/removed-syntax-closure-lifetime.rs b/tests/ui/parser/removed-syntax-closure-lifetime.rs deleted file mode 100644 index e807a179473..00000000000 --- a/tests/ui/parser/removed-syntax-closure-lifetime.rs +++ /dev/null @@ -1,2 +0,0 @@ -type closure = Box; -//~^ ERROR expected one of `!`, `(`, `+`, `,`, `::`, `:`, `<`, `=`, or `>`, found `/` diff --git a/tests/ui/parser/removed-syntax-closure-lifetime.stderr b/tests/ui/parser/removed-syntax-closure-lifetime.stderr deleted file mode 100644 index 4c991d67ea7..00000000000 --- a/tests/ui/parser/removed-syntax-closure-lifetime.stderr +++ /dev/null @@ -1,13 +0,0 @@ -error: expected one of `!`, `(`, `+`, `,`, `::`, `:`, `<`, `=`, or `>`, found `/` - --> $DIR/removed-syntax-closure-lifetime.rs:1:22 - | -LL | type closure = Box; - | ^ expected one of 9 possible tokens - | -help: you might have meant to end the type parameters here - | -LL | type closure = Box/fn()>; - | + - -error: aborting due to 1 previous error - diff --git a/tests/ui/parser/removed-syntax-enum-newtype.rs b/tests/ui/parser/removed-syntax-enum-newtype.rs deleted file mode 100644 index 518f90b2b83..00000000000 --- a/tests/ui/parser/removed-syntax-enum-newtype.rs +++ /dev/null @@ -1 +0,0 @@ -enum e = isize; //~ ERROR expected one of `<`, `where`, or `{`, found `=` diff --git a/tests/ui/parser/removed-syntax-enum-newtype.stderr b/tests/ui/parser/removed-syntax-enum-newtype.stderr deleted file mode 100644 index 5b917e93853..00000000000 --- a/tests/ui/parser/removed-syntax-enum-newtype.stderr +++ /dev/null @@ -1,10 +0,0 @@ -error: expected one of `<`, `where`, or `{`, found `=` - --> $DIR/removed-syntax-enum-newtype.rs:1:8 - | -LL | enum e = isize; - | - ^ expected one of `<`, `where`, or `{` - | | - | while parsing this enum - -error: aborting due to 1 previous error - diff --git a/tests/ui/parser/removed-syntax-field-let-2.rs b/tests/ui/parser/removed-syntax-field-let-2.rs deleted file mode 100644 index 7ff91b476ae..00000000000 --- a/tests/ui/parser/removed-syntax-field-let-2.rs +++ /dev/null @@ -1,12 +0,0 @@ -struct Foo { - let x: i32, - //~^ ERROR expected identifier, found keyword - let y: i32, - //~^ ERROR expected identifier, found keyword -} - -fn main() { - let _ = Foo { - //~^ ERROR missing fields `x` and `y` in initializer of `Foo` - }; -} diff --git a/tests/ui/parser/removed-syntax-field-let-2.stderr b/tests/ui/parser/removed-syntax-field-let-2.stderr deleted file mode 100644 index fda0919b9b6..00000000000 --- a/tests/ui/parser/removed-syntax-field-let-2.stderr +++ /dev/null @@ -1,33 +0,0 @@ -error: expected identifier, found keyword `let` - --> $DIR/removed-syntax-field-let-2.rs:2:5 - | -LL | let x: i32, - | ^^^- - | | - | expected identifier, found keyword - | help: remove this `let` keyword - | - = note: the `let` keyword is not allowed in `struct` fields - = note: see for more information - -error: expected identifier, found keyword `let` - --> $DIR/removed-syntax-field-let-2.rs:4:5 - | -LL | let y: i32, - | ^^^- - | | - | expected identifier, found keyword - | help: remove this `let` keyword - | - = note: the `let` keyword is not allowed in `struct` fields - = note: see for more information - -error[E0063]: missing fields `x` and `y` in initializer of `Foo` - --> $DIR/removed-syntax-field-let-2.rs:9:13 - | -LL | let _ = Foo { - | ^^^ missing `x` and `y` - -error: aborting due to 3 previous errors - -For more information about this error, try `rustc --explain E0063`. diff --git a/tests/ui/parser/removed-syntax-field-let.rs b/tests/ui/parser/removed-syntax-field-let.rs deleted file mode 100644 index 6d64de296f1..00000000000 --- a/tests/ui/parser/removed-syntax-field-let.rs +++ /dev/null @@ -1,6 +0,0 @@ -struct S { - let foo: (), - //~^ ERROR expected identifier, found keyword `let` -} - -fn main() {} diff --git a/tests/ui/parser/removed-syntax-field-let.stderr b/tests/ui/parser/removed-syntax-field-let.stderr deleted file mode 100644 index 339d056e636..00000000000 --- a/tests/ui/parser/removed-syntax-field-let.stderr +++ /dev/null @@ -1,14 +0,0 @@ -error: expected identifier, found keyword `let` - --> $DIR/removed-syntax-field-let.rs:2:5 - | -LL | let foo: (), - | ^^^- - | | - | expected identifier, found keyword - | help: remove this `let` keyword - | - = note: the `let` keyword is not allowed in `struct` fields - = note: see for more information - -error: aborting due to 1 previous error - diff --git a/tests/ui/parser/removed-syntax-field-semicolon.rs b/tests/ui/parser/removed-syntax-field-semicolon.rs deleted file mode 100644 index 808f2a5cc38..00000000000 --- a/tests/ui/parser/removed-syntax-field-semicolon.rs +++ /dev/null @@ -1,6 +0,0 @@ -struct S { - bar: (); - //~^ ERROR struct fields are separated by `,` -} - -fn main() {} diff --git a/tests/ui/parser/removed-syntax-field-semicolon.stderr b/tests/ui/parser/removed-syntax-field-semicolon.stderr deleted file mode 100644 index 522912a9e1c..00000000000 --- a/tests/ui/parser/removed-syntax-field-semicolon.stderr +++ /dev/null @@ -1,10 +0,0 @@ -error: struct fields are separated by `,` - --> $DIR/removed-syntax-field-semicolon.rs:2:12 - | -LL | struct S { - | - while parsing this struct -LL | bar: (); - | ^ help: replace `;` with `,` - -error: aborting due to 1 previous error - diff --git a/tests/ui/parser/removed-syntax-fixed-vec.rs b/tests/ui/parser/removed-syntax-fixed-vec.rs deleted file mode 100644 index 560efecb91c..00000000000 --- a/tests/ui/parser/removed-syntax-fixed-vec.rs +++ /dev/null @@ -1 +0,0 @@ -type v = [isize * 3]; //~ ERROR expected one of `!`, `(`, `+`, `::`, `;`, `<`, or `]`, found `*` diff --git a/tests/ui/parser/removed-syntax-fixed-vec.stderr b/tests/ui/parser/removed-syntax-fixed-vec.stderr deleted file mode 100644 index 5bc9c2ccf00..00000000000 --- a/tests/ui/parser/removed-syntax-fixed-vec.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: expected one of `!`, `(`, `+`, `::`, `;`, `<`, or `]`, found `*` - --> $DIR/removed-syntax-fixed-vec.rs:1:17 - | -LL | type v = [isize * 3]; - | ^ expected one of 7 possible tokens - -error: aborting due to 1 previous error - diff --git a/tests/ui/parser/removed-syntax-fn-sigil.rs b/tests/ui/parser/removed-syntax-fn-sigil.rs deleted file mode 100644 index d55a032d1f2..00000000000 --- a/tests/ui/parser/removed-syntax-fn-sigil.rs +++ /dev/null @@ -1,4 +0,0 @@ -fn main() { - let x: fn~() = || (); //~ ERROR missing parameters for function definition - //~| ERROR expected one of `->`, `;`, or `=`, found `~` -} diff --git a/tests/ui/parser/removed-syntax-fn-sigil.stderr b/tests/ui/parser/removed-syntax-fn-sigil.stderr deleted file mode 100644 index 0d377416700..00000000000 --- a/tests/ui/parser/removed-syntax-fn-sigil.stderr +++ /dev/null @@ -1,14 +0,0 @@ -error: missing parameters for function definition - --> $DIR/removed-syntax-fn-sigil.rs:2:14 - | -LL | let x: fn~() = || (); - | ^ help: add a parameter list - -error: expected one of `->`, `;`, or `=`, found `~` - --> $DIR/removed-syntax-fn-sigil.rs:2:14 - | -LL | let x: fn~() = || (); - | ^ expected one of `->`, `;`, or `=` - -error: aborting due to 2 previous errors - diff --git a/tests/ui/parser/removed-syntax-mode.rs b/tests/ui/parser/removed-syntax-mode.rs deleted file mode 100644 index a438db3b0c1..00000000000 --- a/tests/ui/parser/removed-syntax-mode.rs +++ /dev/null @@ -1,4 +0,0 @@ -fn f(+x: isize) {} -//~^ ERROR expected parameter name, found `+` - -fn main() {} diff --git a/tests/ui/parser/removed-syntax-mode.stderr b/tests/ui/parser/removed-syntax-mode.stderr deleted file mode 100644 index fd964c4b7f0..00000000000 --- a/tests/ui/parser/removed-syntax-mode.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: expected parameter name, found `+` - --> $DIR/removed-syntax-mode.rs:1:6 - | -LL | fn f(+x: isize) {} - | ^ expected parameter name - -error: aborting due to 1 previous error - diff --git a/tests/ui/parser/removed-syntax-mut-vec-expr.rs b/tests/ui/parser/removed-syntax-mut-vec-expr.rs deleted file mode 100644 index 2ee95db5a25..00000000000 --- a/tests/ui/parser/removed-syntax-mut-vec-expr.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - let v = [mut 1, 2, 3, 4]; //~ ERROR expected expression, found keyword `mut` -} diff --git a/tests/ui/parser/removed-syntax-mut-vec-expr.stderr b/tests/ui/parser/removed-syntax-mut-vec-expr.stderr deleted file mode 100644 index a1aa1ae49e3..00000000000 --- a/tests/ui/parser/removed-syntax-mut-vec-expr.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: expected expression, found keyword `mut` - --> $DIR/removed-syntax-mut-vec-expr.rs:2:14 - | -LL | let v = [mut 1, 2, 3, 4]; - | ^^^ expected expression - -error: aborting due to 1 previous error - diff --git a/tests/ui/parser/removed-syntax-mut-vec-ty.rs b/tests/ui/parser/removed-syntax-mut-vec-ty.rs deleted file mode 100644 index 923a7ea37a4..00000000000 --- a/tests/ui/parser/removed-syntax-mut-vec-ty.rs +++ /dev/null @@ -1 +0,0 @@ -type v = [mut isize]; //~ ERROR expected type, found keyword `mut` diff --git a/tests/ui/parser/removed-syntax-mut-vec-ty.stderr b/tests/ui/parser/removed-syntax-mut-vec-ty.stderr deleted file mode 100644 index beaae7cddaa..00000000000 --- a/tests/ui/parser/removed-syntax-mut-vec-ty.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: expected type, found keyword `mut` - --> $DIR/removed-syntax-mut-vec-ty.rs:1:11 - | -LL | type v = [mut isize]; - | ^^^ expected type - -error: aborting due to 1 previous error - diff --git a/tests/ui/parser/removed-syntax-ptr-lifetime.rs b/tests/ui/parser/removed-syntax-ptr-lifetime.rs deleted file mode 100644 index cc69af44a13..00000000000 --- a/tests/ui/parser/removed-syntax-ptr-lifetime.rs +++ /dev/null @@ -1 +0,0 @@ -type bptr = &lifetime/isize; //~ ERROR expected one of `!`, `(`, `::`, `;`, `<`, or `where`, found `/` diff --git a/tests/ui/parser/removed-syntax-ptr-lifetime.stderr b/tests/ui/parser/removed-syntax-ptr-lifetime.stderr deleted file mode 100644 index 5c74efffabf..00000000000 --- a/tests/ui/parser/removed-syntax-ptr-lifetime.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: expected one of `!`, `(`, `::`, `;`, `<`, or `where`, found `/` - --> $DIR/removed-syntax-ptr-lifetime.rs:1:22 - | -LL | type bptr = &lifetime/isize; - | ^ expected one of `!`, `(`, `::`, `;`, `<`, or `where` - -error: aborting due to 1 previous error - diff --git a/tests/ui/parser/removed-syntax-record.rs b/tests/ui/parser/removed-syntax-record.rs deleted file mode 100644 index d1d91c8f7dc..00000000000 --- a/tests/ui/parser/removed-syntax-record.rs +++ /dev/null @@ -1 +0,0 @@ -type t = { f: () }; //~ ERROR expected type, found `{` diff --git a/tests/ui/parser/removed-syntax-record.stderr b/tests/ui/parser/removed-syntax-record.stderr deleted file mode 100644 index dbf09f1c75b..00000000000 --- a/tests/ui/parser/removed-syntax-record.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: expected type, found `{` - --> $DIR/removed-syntax-record.rs:1:10 - | -LL | type t = { f: () }; - | ^ expected type - -error: aborting due to 1 previous error - diff --git a/tests/ui/parser/removed-syntax-static-fn.rs b/tests/ui/parser/removed-syntax-static-fn.rs deleted file mode 100644 index cd643b874db..00000000000 --- a/tests/ui/parser/removed-syntax-static-fn.rs +++ /dev/null @@ -1,10 +0,0 @@ -struct S; - -impl S { - static fn f() {} - //~^ ERROR expected identifier, found keyword `fn` - //~| ERROR expected one of `:`, `;`, or `=` - //~| ERROR missing type for `static` item -} - -fn main() {} diff --git a/tests/ui/parser/removed-syntax-static-fn.stderr b/tests/ui/parser/removed-syntax-static-fn.stderr deleted file mode 100644 index 52e0658949d..00000000000 --- a/tests/ui/parser/removed-syntax-static-fn.stderr +++ /dev/null @@ -1,25 +0,0 @@ -error: expected identifier, found keyword `fn` - --> $DIR/removed-syntax-static-fn.rs:4:12 - | -LL | static fn f() {} - | ^^ expected identifier, found keyword - -error: expected one of `:`, `;`, or `=`, found `f` - --> $DIR/removed-syntax-static-fn.rs:4:15 - | -LL | impl S { - | - while parsing this item list starting here -LL | static fn f() {} - | ^ expected one of `:`, `;`, or `=` -... -LL | } - | - the item list ends here - -error: missing type for `static` item - --> $DIR/removed-syntax-static-fn.rs:4:14 - | -LL | static fn f() {} - | ^ help: provide a type for the item: `: ` - -error: aborting due to 3 previous errors - diff --git a/tests/ui/parser/removed-syntax-uniq-mut-expr.rs b/tests/ui/parser/removed-syntax-uniq-mut-expr.rs deleted file mode 100644 index 08ef4b43269..00000000000 --- a/tests/ui/parser/removed-syntax-uniq-mut-expr.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - let a_box = box mut 42; //~ ERROR expected expression, found keyword `mut` -} diff --git a/tests/ui/parser/removed-syntax-uniq-mut-expr.stderr b/tests/ui/parser/removed-syntax-uniq-mut-expr.stderr deleted file mode 100644 index 7aaedad19d8..00000000000 --- a/tests/ui/parser/removed-syntax-uniq-mut-expr.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: expected expression, found keyword `mut` - --> $DIR/removed-syntax-uniq-mut-expr.rs:2:21 - | -LL | let a_box = box mut 42; - | ^^^ expected expression - -error: aborting due to 1 previous error - diff --git a/tests/ui/parser/removed-syntax-uniq-mut-ty.rs b/tests/ui/parser/removed-syntax-uniq-mut-ty.rs deleted file mode 100644 index a8dee5bbda4..00000000000 --- a/tests/ui/parser/removed-syntax-uniq-mut-ty.rs +++ /dev/null @@ -1,2 +0,0 @@ -type mut_box = Box; -//~^ ERROR expected one of `>`, a const expression, lifetime, or type, found keyword `mut` diff --git a/tests/ui/parser/removed-syntax-uniq-mut-ty.stderr b/tests/ui/parser/removed-syntax-uniq-mut-ty.stderr deleted file mode 100644 index 5ae1f4f587e..00000000000 --- a/tests/ui/parser/removed-syntax-uniq-mut-ty.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: expected one of `>`, a const expression, lifetime, or type, found keyword `mut` - --> $DIR/removed-syntax-uniq-mut-ty.rs:1:20 - | -LL | type mut_box = Box; - | ^^^ expected one of `>`, a const expression, lifetime, or type - -error: aborting due to 1 previous error - diff --git a/tests/ui/parser/removed-syntax-with-1.rs b/tests/ui/parser/removed-syntax-with-1.rs deleted file mode 100644 index 2c1e152dcee..00000000000 --- a/tests/ui/parser/removed-syntax-with-1.rs +++ /dev/null @@ -1,10 +0,0 @@ -fn main() { - struct S { - foo: (), - bar: (), - } - - let a = S { foo: (), bar: () }; - let b = S { foo: () with a, bar: () }; - //~^ ERROR expected one of `,`, `.`, `?`, `}`, or an operator, found `with` -} diff --git a/tests/ui/parser/removed-syntax-with-1.stderr b/tests/ui/parser/removed-syntax-with-1.stderr deleted file mode 100644 index 78042678a87..00000000000 --- a/tests/ui/parser/removed-syntax-with-1.stderr +++ /dev/null @@ -1,11 +0,0 @@ -error: expected one of `,`, `.`, `?`, `}`, or an operator, found `with` - --> $DIR/removed-syntax-with-1.rs:8:25 - | -LL | let b = S { foo: () with a, bar: () }; - | - -^^^^ expected one of `,`, `.`, `?`, `}`, or an operator - | | | - | | help: try adding a comma: `,` - | while parsing this struct - -error: aborting due to 1 previous error - diff --git a/tests/ui/parser/removed-syntax-with-2.rs b/tests/ui/parser/removed-syntax-with-2.rs deleted file mode 100644 index 451057c66a1..00000000000 --- a/tests/ui/parser/removed-syntax-with-2.rs +++ /dev/null @@ -1,11 +0,0 @@ -fn main() { - struct S { - foo: (), - bar: (), - } - - let a = S { foo: (), bar: () }; - let b = S { foo: (), with a }; - //~^ ERROR expected one of `,`, `:`, or `}`, found `a` - //~| ERROR missing field `bar` in initializer of `S` -} diff --git a/tests/ui/parser/removed-syntax-with-2.stderr b/tests/ui/parser/removed-syntax-with-2.stderr deleted file mode 100644 index e75c5bcd643..00000000000 --- a/tests/ui/parser/removed-syntax-with-2.stderr +++ /dev/null @@ -1,18 +0,0 @@ -error: expected one of `,`, `:`, or `}`, found `a` - --> $DIR/removed-syntax-with-2.rs:8:31 - | -LL | let b = S { foo: (), with a }; - | - ---- ^ expected one of `,`, `:`, or `}` - | | | - | | while parsing this struct field - | while parsing this struct - -error[E0063]: missing field `bar` in initializer of `S` - --> $DIR/removed-syntax-with-2.rs:8:13 - | -LL | let b = S { foo: (), with a }; - | ^ missing `bar` - -error: aborting due to 2 previous errors - -For more information about this error, try `rustc --explain E0063`. diff --git a/tests/ui/parser/removed-syntax/removed-syntax-box.fixed b/tests/ui/parser/removed-syntax/removed-syntax-box.fixed new file mode 100644 index 00000000000..09d1304b775 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-box.fixed @@ -0,0 +1,14 @@ +// run-rustfix + +fn main() { + #[allow(dead_code)] + struct T { + a: u8, + b: u8, + } + let _ = Box::new(()); //~ ERROR `box_syntax` has been removed + let _ = Box::new(1); //~ ERROR `box_syntax` has been removed + let _ = Box::new(T { a: 12, b: 18 }); //~ ERROR `box_syntax` has been removed + let _ = Box::new([5; 30]); //~ ERROR `box_syntax` has been removed + let _: Box<()> = Box::new(()); //~ ERROR `box_syntax` has been removed +} diff --git a/tests/ui/parser/removed-syntax/removed-syntax-box.rs b/tests/ui/parser/removed-syntax/removed-syntax-box.rs new file mode 100644 index 00000000000..1f5061b02c7 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-box.rs @@ -0,0 +1,14 @@ +// run-rustfix + +fn main() { + #[allow(dead_code)] + struct T { + a: u8, + b: u8, + } + let _ = box (); //~ ERROR `box_syntax` has been removed + let _ = box 1; //~ ERROR `box_syntax` has been removed + let _ = box T { a: 12, b: 18 }; //~ ERROR `box_syntax` has been removed + let _ = box [5; 30]; //~ ERROR `box_syntax` has been removed + let _: Box<()> = box (); //~ ERROR `box_syntax` has been removed +} diff --git a/tests/ui/parser/removed-syntax/removed-syntax-box.stderr b/tests/ui/parser/removed-syntax/removed-syntax-box.stderr new file mode 100644 index 00000000000..46b891587d5 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-box.stderr @@ -0,0 +1,57 @@ +error: `box_syntax` has been removed + --> $DIR/removed-syntax-box.rs:9:13 + | +LL | let _ = box (); + | ^^^^^^ + | +help: use `Box::new()` instead + | +LL | let _ = Box::new(()); + | ~~~~~~~~~~~~ + +error: `box_syntax` has been removed + --> $DIR/removed-syntax-box.rs:10:13 + | +LL | let _ = box 1; + | ^^^^^ + | +help: use `Box::new()` instead + | +LL | let _ = Box::new(1); + | ~~~~~~~~~~~ + +error: `box_syntax` has been removed + --> $DIR/removed-syntax-box.rs:11:13 + | +LL | let _ = box T { a: 12, b: 18 }; + | ^^^^^^^^^^^^^^^^^^^^^^ + | +help: use `Box::new()` instead + | +LL | let _ = Box::new(T { a: 12, b: 18 }); + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +error: `box_syntax` has been removed + --> $DIR/removed-syntax-box.rs:12:13 + | +LL | let _ = box [5; 30]; + | ^^^^^^^^^^^ + | +help: use `Box::new()` instead + | +LL | let _ = Box::new([5; 30]); + | ~~~~~~~~~~~~~~~~~ + +error: `box_syntax` has been removed + --> $DIR/removed-syntax-box.rs:13:22 + | +LL | let _: Box<()> = box (); + | ^^^^^^ + | +help: use `Box::new()` instead + | +LL | let _: Box<()> = Box::new(()); + | ~~~~~~~~~~~~ + +error: aborting due to 5 previous errors + diff --git a/tests/ui/parser/removed-syntax/removed-syntax-closure-lifetime.rs b/tests/ui/parser/removed-syntax/removed-syntax-closure-lifetime.rs new file mode 100644 index 00000000000..e807a179473 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-closure-lifetime.rs @@ -0,0 +1,2 @@ +type closure = Box; +//~^ ERROR expected one of `!`, `(`, `+`, `,`, `::`, `:`, `<`, `=`, or `>`, found `/` diff --git a/tests/ui/parser/removed-syntax/removed-syntax-closure-lifetime.stderr b/tests/ui/parser/removed-syntax/removed-syntax-closure-lifetime.stderr new file mode 100644 index 00000000000..4c991d67ea7 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-closure-lifetime.stderr @@ -0,0 +1,13 @@ +error: expected one of `!`, `(`, `+`, `,`, `::`, `:`, `<`, `=`, or `>`, found `/` + --> $DIR/removed-syntax-closure-lifetime.rs:1:22 + | +LL | type closure = Box; + | ^ expected one of 9 possible tokens + | +help: you might have meant to end the type parameters here + | +LL | type closure = Box/fn()>; + | + + +error: aborting due to 1 previous error + diff --git a/tests/ui/parser/removed-syntax/removed-syntax-enum-newtype.rs b/tests/ui/parser/removed-syntax/removed-syntax-enum-newtype.rs new file mode 100644 index 00000000000..518f90b2b83 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-enum-newtype.rs @@ -0,0 +1 @@ +enum e = isize; //~ ERROR expected one of `<`, `where`, or `{`, found `=` diff --git a/tests/ui/parser/removed-syntax/removed-syntax-enum-newtype.stderr b/tests/ui/parser/removed-syntax/removed-syntax-enum-newtype.stderr new file mode 100644 index 00000000000..5b917e93853 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-enum-newtype.stderr @@ -0,0 +1,10 @@ +error: expected one of `<`, `where`, or `{`, found `=` + --> $DIR/removed-syntax-enum-newtype.rs:1:8 + | +LL | enum e = isize; + | - ^ expected one of `<`, `where`, or `{` + | | + | while parsing this enum + +error: aborting due to 1 previous error + diff --git a/tests/ui/parser/removed-syntax/removed-syntax-field-let-2.rs b/tests/ui/parser/removed-syntax/removed-syntax-field-let-2.rs new file mode 100644 index 00000000000..7ff91b476ae --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-field-let-2.rs @@ -0,0 +1,12 @@ +struct Foo { + let x: i32, + //~^ ERROR expected identifier, found keyword + let y: i32, + //~^ ERROR expected identifier, found keyword +} + +fn main() { + let _ = Foo { + //~^ ERROR missing fields `x` and `y` in initializer of `Foo` + }; +} diff --git a/tests/ui/parser/removed-syntax/removed-syntax-field-let-2.stderr b/tests/ui/parser/removed-syntax/removed-syntax-field-let-2.stderr new file mode 100644 index 00000000000..fda0919b9b6 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-field-let-2.stderr @@ -0,0 +1,33 @@ +error: expected identifier, found keyword `let` + --> $DIR/removed-syntax-field-let-2.rs:2:5 + | +LL | let x: i32, + | ^^^- + | | + | expected identifier, found keyword + | help: remove this `let` keyword + | + = note: the `let` keyword is not allowed in `struct` fields + = note: see for more information + +error: expected identifier, found keyword `let` + --> $DIR/removed-syntax-field-let-2.rs:4:5 + | +LL | let y: i32, + | ^^^- + | | + | expected identifier, found keyword + | help: remove this `let` keyword + | + = note: the `let` keyword is not allowed in `struct` fields + = note: see for more information + +error[E0063]: missing fields `x` and `y` in initializer of `Foo` + --> $DIR/removed-syntax-field-let-2.rs:9:13 + | +LL | let _ = Foo { + | ^^^ missing `x` and `y` + +error: aborting due to 3 previous errors + +For more information about this error, try `rustc --explain E0063`. diff --git a/tests/ui/parser/removed-syntax/removed-syntax-field-let.rs b/tests/ui/parser/removed-syntax/removed-syntax-field-let.rs new file mode 100644 index 00000000000..6d64de296f1 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-field-let.rs @@ -0,0 +1,6 @@ +struct S { + let foo: (), + //~^ ERROR expected identifier, found keyword `let` +} + +fn main() {} diff --git a/tests/ui/parser/removed-syntax/removed-syntax-field-let.stderr b/tests/ui/parser/removed-syntax/removed-syntax-field-let.stderr new file mode 100644 index 00000000000..339d056e636 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-field-let.stderr @@ -0,0 +1,14 @@ +error: expected identifier, found keyword `let` + --> $DIR/removed-syntax-field-let.rs:2:5 + | +LL | let foo: (), + | ^^^- + | | + | expected identifier, found keyword + | help: remove this `let` keyword + | + = note: the `let` keyword is not allowed in `struct` fields + = note: see for more information + +error: aborting due to 1 previous error + diff --git a/tests/ui/parser/removed-syntax/removed-syntax-field-semicolon.rs b/tests/ui/parser/removed-syntax/removed-syntax-field-semicolon.rs new file mode 100644 index 00000000000..808f2a5cc38 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-field-semicolon.rs @@ -0,0 +1,6 @@ +struct S { + bar: (); + //~^ ERROR struct fields are separated by `,` +} + +fn main() {} diff --git a/tests/ui/parser/removed-syntax/removed-syntax-field-semicolon.stderr b/tests/ui/parser/removed-syntax/removed-syntax-field-semicolon.stderr new file mode 100644 index 00000000000..522912a9e1c --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-field-semicolon.stderr @@ -0,0 +1,10 @@ +error: struct fields are separated by `,` + --> $DIR/removed-syntax-field-semicolon.rs:2:12 + | +LL | struct S { + | - while parsing this struct +LL | bar: (); + | ^ help: replace `;` with `,` + +error: aborting due to 1 previous error + diff --git a/tests/ui/parser/removed-syntax/removed-syntax-fixed-vec.rs b/tests/ui/parser/removed-syntax/removed-syntax-fixed-vec.rs new file mode 100644 index 00000000000..560efecb91c --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-fixed-vec.rs @@ -0,0 +1 @@ +type v = [isize * 3]; //~ ERROR expected one of `!`, `(`, `+`, `::`, `;`, `<`, or `]`, found `*` diff --git a/tests/ui/parser/removed-syntax/removed-syntax-fixed-vec.stderr b/tests/ui/parser/removed-syntax/removed-syntax-fixed-vec.stderr new file mode 100644 index 00000000000..5bc9c2ccf00 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-fixed-vec.stderr @@ -0,0 +1,8 @@ +error: expected one of `!`, `(`, `+`, `::`, `;`, `<`, or `]`, found `*` + --> $DIR/removed-syntax-fixed-vec.rs:1:17 + | +LL | type v = [isize * 3]; + | ^ expected one of 7 possible tokens + +error: aborting due to 1 previous error + diff --git a/tests/ui/parser/removed-syntax/removed-syntax-fn-sigil.rs b/tests/ui/parser/removed-syntax/removed-syntax-fn-sigil.rs new file mode 100644 index 00000000000..d55a032d1f2 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-fn-sigil.rs @@ -0,0 +1,4 @@ +fn main() { + let x: fn~() = || (); //~ ERROR missing parameters for function definition + //~| ERROR expected one of `->`, `;`, or `=`, found `~` +} diff --git a/tests/ui/parser/removed-syntax/removed-syntax-fn-sigil.stderr b/tests/ui/parser/removed-syntax/removed-syntax-fn-sigil.stderr new file mode 100644 index 00000000000..0d377416700 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-fn-sigil.stderr @@ -0,0 +1,14 @@ +error: missing parameters for function definition + --> $DIR/removed-syntax-fn-sigil.rs:2:14 + | +LL | let x: fn~() = || (); + | ^ help: add a parameter list + +error: expected one of `->`, `;`, or `=`, found `~` + --> $DIR/removed-syntax-fn-sigil.rs:2:14 + | +LL | let x: fn~() = || (); + | ^ expected one of `->`, `;`, or `=` + +error: aborting due to 2 previous errors + diff --git a/tests/ui/parser/removed-syntax/removed-syntax-mode.rs b/tests/ui/parser/removed-syntax/removed-syntax-mode.rs new file mode 100644 index 00000000000..a438db3b0c1 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-mode.rs @@ -0,0 +1,4 @@ +fn f(+x: isize) {} +//~^ ERROR expected parameter name, found `+` + +fn main() {} diff --git a/tests/ui/parser/removed-syntax/removed-syntax-mode.stderr b/tests/ui/parser/removed-syntax/removed-syntax-mode.stderr new file mode 100644 index 00000000000..fd964c4b7f0 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-mode.stderr @@ -0,0 +1,8 @@ +error: expected parameter name, found `+` + --> $DIR/removed-syntax-mode.rs:1:6 + | +LL | fn f(+x: isize) {} + | ^ expected parameter name + +error: aborting due to 1 previous error + diff --git a/tests/ui/parser/removed-syntax/removed-syntax-mut-vec-expr.rs b/tests/ui/parser/removed-syntax/removed-syntax-mut-vec-expr.rs new file mode 100644 index 00000000000..2ee95db5a25 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-mut-vec-expr.rs @@ -0,0 +1,3 @@ +fn main() { + let v = [mut 1, 2, 3, 4]; //~ ERROR expected expression, found keyword `mut` +} diff --git a/tests/ui/parser/removed-syntax/removed-syntax-mut-vec-expr.stderr b/tests/ui/parser/removed-syntax/removed-syntax-mut-vec-expr.stderr new file mode 100644 index 00000000000..a1aa1ae49e3 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-mut-vec-expr.stderr @@ -0,0 +1,8 @@ +error: expected expression, found keyword `mut` + --> $DIR/removed-syntax-mut-vec-expr.rs:2:14 + | +LL | let v = [mut 1, 2, 3, 4]; + | ^^^ expected expression + +error: aborting due to 1 previous error + diff --git a/tests/ui/parser/removed-syntax/removed-syntax-mut-vec-ty.rs b/tests/ui/parser/removed-syntax/removed-syntax-mut-vec-ty.rs new file mode 100644 index 00000000000..923a7ea37a4 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-mut-vec-ty.rs @@ -0,0 +1 @@ +type v = [mut isize]; //~ ERROR expected type, found keyword `mut` diff --git a/tests/ui/parser/removed-syntax/removed-syntax-mut-vec-ty.stderr b/tests/ui/parser/removed-syntax/removed-syntax-mut-vec-ty.stderr new file mode 100644 index 00000000000..beaae7cddaa --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-mut-vec-ty.stderr @@ -0,0 +1,8 @@ +error: expected type, found keyword `mut` + --> $DIR/removed-syntax-mut-vec-ty.rs:1:11 + | +LL | type v = [mut isize]; + | ^^^ expected type + +error: aborting due to 1 previous error + diff --git a/tests/ui/parser/removed-syntax/removed-syntax-ptr-lifetime.rs b/tests/ui/parser/removed-syntax/removed-syntax-ptr-lifetime.rs new file mode 100644 index 00000000000..cc69af44a13 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-ptr-lifetime.rs @@ -0,0 +1 @@ +type bptr = &lifetime/isize; //~ ERROR expected one of `!`, `(`, `::`, `;`, `<`, or `where`, found `/` diff --git a/tests/ui/parser/removed-syntax/removed-syntax-ptr-lifetime.stderr b/tests/ui/parser/removed-syntax/removed-syntax-ptr-lifetime.stderr new file mode 100644 index 00000000000..5c74efffabf --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-ptr-lifetime.stderr @@ -0,0 +1,8 @@ +error: expected one of `!`, `(`, `::`, `;`, `<`, or `where`, found `/` + --> $DIR/removed-syntax-ptr-lifetime.rs:1:22 + | +LL | type bptr = &lifetime/isize; + | ^ expected one of `!`, `(`, `::`, `;`, `<`, or `where` + +error: aborting due to 1 previous error + diff --git a/tests/ui/parser/removed-syntax/removed-syntax-record.rs b/tests/ui/parser/removed-syntax/removed-syntax-record.rs new file mode 100644 index 00000000000..d1d91c8f7dc --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-record.rs @@ -0,0 +1 @@ +type t = { f: () }; //~ ERROR expected type, found `{` diff --git a/tests/ui/parser/removed-syntax/removed-syntax-record.stderr b/tests/ui/parser/removed-syntax/removed-syntax-record.stderr new file mode 100644 index 00000000000..dbf09f1c75b --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-record.stderr @@ -0,0 +1,8 @@ +error: expected type, found `{` + --> $DIR/removed-syntax-record.rs:1:10 + | +LL | type t = { f: () }; + | ^ expected type + +error: aborting due to 1 previous error + diff --git a/tests/ui/parser/removed-syntax/removed-syntax-static-fn.rs b/tests/ui/parser/removed-syntax/removed-syntax-static-fn.rs new file mode 100644 index 00000000000..cd643b874db --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-static-fn.rs @@ -0,0 +1,10 @@ +struct S; + +impl S { + static fn f() {} + //~^ ERROR expected identifier, found keyword `fn` + //~| ERROR expected one of `:`, `;`, or `=` + //~| ERROR missing type for `static` item +} + +fn main() {} diff --git a/tests/ui/parser/removed-syntax/removed-syntax-static-fn.stderr b/tests/ui/parser/removed-syntax/removed-syntax-static-fn.stderr new file mode 100644 index 00000000000..52e0658949d --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-static-fn.stderr @@ -0,0 +1,25 @@ +error: expected identifier, found keyword `fn` + --> $DIR/removed-syntax-static-fn.rs:4:12 + | +LL | static fn f() {} + | ^^ expected identifier, found keyword + +error: expected one of `:`, `;`, or `=`, found `f` + --> $DIR/removed-syntax-static-fn.rs:4:15 + | +LL | impl S { + | - while parsing this item list starting here +LL | static fn f() {} + | ^ expected one of `:`, `;`, or `=` +... +LL | } + | - the item list ends here + +error: missing type for `static` item + --> $DIR/removed-syntax-static-fn.rs:4:14 + | +LL | static fn f() {} + | ^ help: provide a type for the item: `: ` + +error: aborting due to 3 previous errors + diff --git a/tests/ui/parser/removed-syntax/removed-syntax-uniq-mut-expr.rs b/tests/ui/parser/removed-syntax/removed-syntax-uniq-mut-expr.rs new file mode 100644 index 00000000000..08ef4b43269 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-uniq-mut-expr.rs @@ -0,0 +1,3 @@ +fn main() { + let a_box = box mut 42; //~ ERROR expected expression, found keyword `mut` +} diff --git a/tests/ui/parser/removed-syntax/removed-syntax-uniq-mut-expr.stderr b/tests/ui/parser/removed-syntax/removed-syntax-uniq-mut-expr.stderr new file mode 100644 index 00000000000..7aaedad19d8 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-uniq-mut-expr.stderr @@ -0,0 +1,8 @@ +error: expected expression, found keyword `mut` + --> $DIR/removed-syntax-uniq-mut-expr.rs:2:21 + | +LL | let a_box = box mut 42; + | ^^^ expected expression + +error: aborting due to 1 previous error + diff --git a/tests/ui/parser/removed-syntax/removed-syntax-uniq-mut-ty.rs b/tests/ui/parser/removed-syntax/removed-syntax-uniq-mut-ty.rs new file mode 100644 index 00000000000..a8dee5bbda4 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-uniq-mut-ty.rs @@ -0,0 +1,2 @@ +type mut_box = Box; +//~^ ERROR expected one of `>`, a const expression, lifetime, or type, found keyword `mut` diff --git a/tests/ui/parser/removed-syntax/removed-syntax-uniq-mut-ty.stderr b/tests/ui/parser/removed-syntax/removed-syntax-uniq-mut-ty.stderr new file mode 100644 index 00000000000..5ae1f4f587e --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-uniq-mut-ty.stderr @@ -0,0 +1,8 @@ +error: expected one of `>`, a const expression, lifetime, or type, found keyword `mut` + --> $DIR/removed-syntax-uniq-mut-ty.rs:1:20 + | +LL | type mut_box = Box; + | ^^^ expected one of `>`, a const expression, lifetime, or type + +error: aborting due to 1 previous error + diff --git a/tests/ui/parser/removed-syntax/removed-syntax-with-1.rs b/tests/ui/parser/removed-syntax/removed-syntax-with-1.rs new file mode 100644 index 00000000000..2c1e152dcee --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-with-1.rs @@ -0,0 +1,10 @@ +fn main() { + struct S { + foo: (), + bar: (), + } + + let a = S { foo: (), bar: () }; + let b = S { foo: () with a, bar: () }; + //~^ ERROR expected one of `,`, `.`, `?`, `}`, or an operator, found `with` +} diff --git a/tests/ui/parser/removed-syntax/removed-syntax-with-1.stderr b/tests/ui/parser/removed-syntax/removed-syntax-with-1.stderr new file mode 100644 index 00000000000..78042678a87 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-with-1.stderr @@ -0,0 +1,11 @@ +error: expected one of `,`, `.`, `?`, `}`, or an operator, found `with` + --> $DIR/removed-syntax-with-1.rs:8:25 + | +LL | let b = S { foo: () with a, bar: () }; + | - -^^^^ expected one of `,`, `.`, `?`, `}`, or an operator + | | | + | | help: try adding a comma: `,` + | while parsing this struct + +error: aborting due to 1 previous error + diff --git a/tests/ui/parser/removed-syntax/removed-syntax-with-2.rs b/tests/ui/parser/removed-syntax/removed-syntax-with-2.rs new file mode 100644 index 00000000000..451057c66a1 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-with-2.rs @@ -0,0 +1,11 @@ +fn main() { + struct S { + foo: (), + bar: (), + } + + let a = S { foo: (), bar: () }; + let b = S { foo: (), with a }; + //~^ ERROR expected one of `,`, `:`, or `}`, found `a` + //~| ERROR missing field `bar` in initializer of `S` +} diff --git a/tests/ui/parser/removed-syntax/removed-syntax-with-2.stderr b/tests/ui/parser/removed-syntax/removed-syntax-with-2.stderr new file mode 100644 index 00000000000..e75c5bcd643 --- /dev/null +++ b/tests/ui/parser/removed-syntax/removed-syntax-with-2.stderr @@ -0,0 +1,18 @@ +error: expected one of `,`, `:`, or `}`, found `a` + --> $DIR/removed-syntax-with-2.rs:8:31 + | +LL | let b = S { foo: (), with a }; + | - ---- ^ expected one of `,`, `:`, or `}` + | | | + | | while parsing this struct field + | while parsing this struct + +error[E0063]: missing field `bar` in initializer of `S` + --> $DIR/removed-syntax-with-2.rs:8:13 + | +LL | let b = S { foo: (), with a }; + | ^ missing `bar` + +error: aborting due to 2 previous errors + +For more information about this error, try `rustc --explain E0063`. -- cgit 1.4.1-3-g733a5