From 9918693037dce8aa4bb6f08741b6812923486c18 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 19 Jun 2024 11:26:03 +0200 Subject: Merging upstream version 1.76.0+dfsg1. Signed-off-by: Daniel Baumann --- tests/ui/parser/issues/issue-100197-mut-let.stderr | 2 +- tests/ui/parser/issues/issue-101477-let.stderr | 2 +- tests/ui/parser/issues/issue-101540.stderr | 2 +- .../issues/issue-102182-impl-trait-recover.stderr | 2 +- tests/ui/parser/issues/issue-103451.stderr | 2 +- tests/ui/parser/issues/issue-10392-2.stderr | 2 +- tests/ui/parser/issues/issue-10392.stderr | 2 +- tests/ui/parser/issues/issue-104088.rs | 19 ------- tests/ui/parser/issues/issue-104088.stderr | 59 ---------------------- tests/ui/parser/issues/issue-104620.rs | 2 +- tests/ui/parser/issues/issue-104620.stderr | 8 +-- tests/ui/parser/issues/issue-105366.stderr | 2 +- tests/ui/parser/issues/issue-10636-1.stderr | 2 +- tests/ui/parser/issues/issue-10636-2.stderr | 2 +- tests/ui/parser/issues/issue-107705.stderr | 2 +- .../issue-108109-fn-trait-missing-paren.stderr | 2 +- .../issues/issue-108242-semicolon-recovery.stderr | 2 +- tests/ui/parser/issues/issue-111148.stderr | 2 +- tests/ui/parser/issues/issue-111416.stderr | 2 +- .../issue-113110-non-item-at-module-root.stderr | 2 +- tests/ui/parser/issues/issue-113203.stderr | 2 +- tests/ui/parser/issues/issue-113342.stderr | 2 +- tests/ui/parser/issues/issue-114219.stderr | 2 +- tests/ui/parser/issues/issue-118530-ice.rs | 15 ++++++ tests/ui/parser/issues/issue-118530-ice.stderr | 43 ++++++++++++++++ tests/ui/parser/issues/issue-118531-ice.rs | 10 ++++ tests/ui/parser/issues/issue-118531-ice.stderr | 38 ++++++++++++++ .../parser/issues/issue-14303-fncall.full.stderr | 2 +- .../issues/issue-14303-fncall.generic_arg.stderr | 2 +- tests/ui/parser/issues/issue-15914.stderr | 2 +- tests/ui/parser/issues/issue-15980.stderr | 2 +- tests/ui/parser/issues/issue-1655.stderr | 2 +- .../ui/parser/issues/issue-17718-const-mut.stderr | 2 +- tests/ui/parser/issues/issue-17904-2.stderr | 2 +- tests/ui/parser/issues/issue-17904.stderr | 2 +- tests/ui/parser/issues/issue-1802-1.stderr | 2 +- tests/ui/parser/issues/issue-1802-2.stderr | 2 +- tests/ui/parser/issues/issue-19398.stderr | 2 +- tests/ui/parser/issues/issue-20616-1.stderr | 2 +- tests/ui/parser/issues/issue-20616-2.stderr | 2 +- tests/ui/parser/issues/issue-20616-3.stderr | 2 +- tests/ui/parser/issues/issue-20616-4.stderr | 2 +- tests/ui/parser/issues/issue-20616-5.stderr | 2 +- tests/ui/parser/issues/issue-20616-6.stderr | 2 +- tests/ui/parser/issues/issue-20616-7.stderr | 2 +- tests/ui/parser/issues/issue-20616-8.stderr | 2 +- tests/ui/parser/issues/issue-20616-9.stderr | 2 +- tests/ui/parser/issues/issue-20711-2.stderr | 2 +- tests/ui/parser/issues/issue-20711.stderr | 2 +- tests/ui/parser/issues/issue-21146.stderr | 2 +- tests/ui/parser/issues/issue-21153.stderr | 2 +- tests/ui/parser/issues/issue-22647.stderr | 2 +- tests/ui/parser/issues/issue-22712.stderr | 2 +- tests/ui/parser/issues/issue-2354-1.stderr | 2 +- tests/ui/parser/issues/issue-2354.stderr | 2 +- tests/ui/parser/issues/issue-24197.stderr | 2 +- tests/ui/parser/issues/issue-24375.rs | 2 +- tests/ui/parser/issues/issue-24375.stderr | 6 +-- tests/ui/parser/issues/issue-24780.stderr | 2 +- tests/ui/parser/issues/issue-3036.stderr | 2 +- tests/ui/parser/issues/issue-31804.stderr | 2 +- tests/ui/parser/issues/issue-32214.stderr | 2 +- tests/ui/parser/issues/issue-32446.stderr | 2 +- tests/ui/parser/issues/issue-32501.stderr | 4 +- tests/ui/parser/issues/issue-33262.stderr | 2 +- tests/ui/parser/issues/issue-33455.stderr | 2 +- tests/ui/parser/issues/issue-34222-1.stderr | 2 +- tests/ui/parser/issues/issue-34255-1.stderr | 2 +- tests/ui/parser/issues/issue-39616.stderr | 2 +- tests/ui/parser/issues/issue-43692.stderr | 2 +- tests/ui/parser/issues/issue-44021.stderr | 2 +- tests/ui/parser/issues/issue-44406.stderr | 2 +- tests/ui/parser/issues/issue-45296.stderr | 2 +- tests/ui/parser/issues/issue-46186.stderr | 2 +- tests/ui/parser/issues/issue-48508.rs | 1 - tests/ui/parser/issues/issue-48636.stderr | 2 +- tests/ui/parser/issues/issue-51602.stderr | 2 +- tests/ui/parser/issues/issue-5544-a.stderr | 2 +- tests/ui/parser/issues/issue-5544-b.stderr | 2 +- tests/ui/parser/issues/issue-56031.stderr | 2 +- tests/ui/parser/issues/issue-57198.stderr | 2 +- tests/ui/parser/issues/issue-5806.stderr | 2 +- .../issue-58094-missing-right-square-bracket.rs | 2 +- ...issue-58094-missing-right-square-bracket.stderr | 2 +- tests/ui/parser/issues/issue-58856-1.stderr | 2 +- tests/ui/parser/issues/issue-58856-2.stderr | 2 +- tests/ui/parser/issues/issue-60075.stderr | 2 +- tests/ui/parser/issues/issue-61858.stderr | 2 +- tests/ui/parser/issues/issue-62524.rs | 2 +- tests/ui/parser/issues/issue-62524.stderr | 2 +- tests/ui/parser/issues/issue-62546.stderr | 2 +- tests/ui/parser/issues/issue-62554.stderr | 2 +- tests/ui/parser/issues/issue-62660.stderr | 2 +- tests/ui/parser/issues/issue-62881.stderr | 2 +- tests/ui/parser/issues/issue-62894.stderr | 2 +- tests/ui/parser/issues/issue-63135.rs | 2 +- tests/ui/parser/issues/issue-63135.stderr | 2 +- .../issue-65122-mac-invoc-in-mut-patterns.stderr | 4 +- tests/ui/parser/issues/issue-6610.stderr | 2 +- .../issue-66357-unexpected-unreachable.stderr | 2 +- .../issue-68091-unicode-ident-after-if.stderr | 2 +- ...8092-unicode-ident-after-incomplete-expr.stderr | 2 +- tests/ui/parser/issues/issue-68890.stderr | 6 ++- .../issues/issue-68987-unmatch-issue-1.stderr | 2 +- .../parser/issues/issue-68987-unmatch-issue.stderr | 2 +- tests/ui/parser/issues/issue-69259.stderr | 2 +- ...ue-70552-ascription-in-parens-after-call.stderr | 2 +- .../issues/issue-70583-block-is-empty-1.stderr | 2 +- .../issues/issue-70583-block-is-empty-2.stderr | 2 +- tests/ui/parser/issues/issue-72253.stderr | 2 +- tests/ui/parser/issues/issue-72373.stderr | 2 +- tests/ui/parser/issues/issue-76437-async.stderr | 2 +- .../issues/issue-76437-const-async-unsafe.stderr | 2 +- .../parser/issues/issue-76437-const-async.stderr | 2 +- tests/ui/parser/issues/issue-76437-const.stderr | 2 +- .../issues/issue-76437-pub-crate-unsafe.stderr | 2 +- tests/ui/parser/issues/issue-76437-unsafe.stderr | 2 +- tests/ui/parser/issues/issue-76597.stderr | 2 +- tests/ui/parser/issues/issue-7970b.stderr | 2 +- tests/ui/parser/issues/issue-81806.stderr | 2 +- tests/ui/parser/issues/issue-83639.stderr | 2 +- tests/ui/parser/issues/issue-84104.stderr | 2 +- tests/ui/parser/issues/issue-84148-2.stderr | 2 +- tests/ui/parser/issues/issue-8537.stderr | 2 +- tests/ui/parser/issues/issue-86895.stderr | 2 +- .../issue-87217-keyword-order/wrong-async.stderr | 2 +- .../issue-87217-keyword-order/wrong-const.stderr | 2 +- .../issue-87217-keyword-order/wrong-unsafe.stderr | 2 +- .../issues/issue-87694-duplicated-pub.stderr | 2 +- .../parser/issues/issue-87694-misplaced-pub.stderr | 2 +- tests/ui/parser/issues/issue-87812-path.stderr | 2 +- tests/ui/parser/issues/issue-87812.stderr | 2 +- tests/ui/parser/issues/issue-88770.stderr | 2 +- tests/ui/parser/issues/issue-88818.stderr | 2 +- tests/ui/parser/issues/issue-89388.stderr | 2 +- tests/ui/parser/issues/issue-89574.stderr | 2 +- ...9971-outer-attr-following-inner-attr-ice.stderr | 2 +- tests/ui/parser/issues/issue-91421.stderr | 2 +- tests/ui/parser/issues/issue-93867.stderr | 2 +- .../issues/issue-98601-delimiter-error-1.stderr | 2 +- ...e-98601-delimiter-error-unexpected-close.stderr | 2 +- ...sue-99625-enum-struct-mutually-exclusive.stderr | 2 +- .../ui/parser/issues/recover-ge-as-fat-arrow.fixed | 7 +++ tests/ui/parser/issues/recover-ge-as-fat-arrow.rs | 7 +++ .../parser/issues/recover-ge-as-fat-arrow.stderr | 25 +++++++++ 145 files changed, 292 insertions(+), 220 deletions(-) delete mode 100644 tests/ui/parser/issues/issue-104088.rs delete mode 100644 tests/ui/parser/issues/issue-104088.stderr create mode 100644 tests/ui/parser/issues/issue-118530-ice.rs create mode 100644 tests/ui/parser/issues/issue-118530-ice.stderr create mode 100644 tests/ui/parser/issues/issue-118531-ice.rs create mode 100644 tests/ui/parser/issues/issue-118531-ice.stderr create mode 100644 tests/ui/parser/issues/recover-ge-as-fat-arrow.fixed create mode 100644 tests/ui/parser/issues/recover-ge-as-fat-arrow.rs create mode 100644 tests/ui/parser/issues/recover-ge-as-fat-arrow.stderr (limited to 'tests/ui/parser/issues') diff --git a/tests/ui/parser/issues/issue-100197-mut-let.stderr b/tests/ui/parser/issues/issue-100197-mut-let.stderr index 86658e4f3..07d136881 100644 --- a/tests/ui/parser/issues/issue-100197-mut-let.stderr +++ b/tests/ui/parser/issues/issue-100197-mut-let.stderr @@ -4,5 +4,5 @@ error: invalid variable declaration LL | mut let _x = 123; | ^^^^^^^ help: switch the order of `mut` and `let`: `let mut` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-101477-let.stderr b/tests/ui/parser/issues/issue-101477-let.stderr index 1b30d4b17..563483573 100644 --- a/tests/ui/parser/issues/issue-101477-let.stderr +++ b/tests/ui/parser/issues/issue-101477-let.stderr @@ -4,5 +4,5 @@ error: unexpected `==` LL | let x == 2; | ^^ help: try using `=` instead -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-101540.stderr b/tests/ui/parser/issues/issue-101540.stderr index 8af887050..40f1d339a 100644 --- a/tests/ui/parser/issues/issue-101540.stderr +++ b/tests/ui/parser/issues/issue-101540.stderr @@ -8,5 +8,5 @@ LL | struct S2 { | = help: consider creating a new `struct` definition instead of nesting -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-102182-impl-trait-recover.stderr b/tests/ui/parser/issues/issue-102182-impl-trait-recover.stderr index 52b6ae5df..cf05337f2 100644 --- a/tests/ui/parser/issues/issue-102182-impl-trait-recover.stderr +++ b/tests/ui/parser/issues/issue-102182-impl-trait-recover.stderr @@ -10,5 +10,5 @@ LL - fn foo() {} LL + fn foo() {} | -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-103451.stderr b/tests/ui/parser/issues/issue-103451.stderr index 6aacd5012..7ad816e45 100644 --- a/tests/ui/parser/issues/issue-103451.stderr +++ b/tests/ui/parser/issues/issue-103451.stderr @@ -8,5 +8,5 @@ LL | x: [u8; R | | | unclosed delimiter -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-10392-2.stderr b/tests/ui/parser/issues/issue-10392-2.stderr index 4154ecfeb..3e5d5062b 100644 --- a/tests/ui/parser/issues/issue-10392-2.stderr +++ b/tests/ui/parser/issues/issue-10392-2.stderr @@ -8,5 +8,5 @@ LL | let A { .., } = a(); | | help: remove this comma | `..` must be at the end and cannot have a trailing comma -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-10392.stderr b/tests/ui/parser/issues/issue-10392.stderr index 438ea67d3..85090d054 100644 --- a/tests/ui/parser/issues/issue-10392.stderr +++ b/tests/ui/parser/issues/issue-10392.stderr @@ -6,5 +6,5 @@ LL | let A { , } = a(); | | | while parsing the fields for this pattern -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-104088.rs b/tests/ui/parser/issues/issue-104088.rs deleted file mode 100644 index 3dc636b6a..000000000 --- a/tests/ui/parser/issues/issue-104088.rs +++ /dev/null @@ -1,19 +0,0 @@ -fn 1234test() { -//~^ ERROR expected identifier, found `1234test` - if let 123 = 123 { println!("yes"); } - - if let 2e1 = 123 { - //~^ ERROR mismatched types - } - - let 23name = 123; - //~^ ERROR expected identifier, found `23name` - - let 2x: i32 = 123; - //~^ ERROR expected identifier, found `2x` - - let 1x = 123; - //~^ ERROR expected identifier, found `1x` -} - -fn main() {} diff --git a/tests/ui/parser/issues/issue-104088.stderr b/tests/ui/parser/issues/issue-104088.stderr deleted file mode 100644 index 8b751759d..000000000 --- a/tests/ui/parser/issues/issue-104088.stderr +++ /dev/null @@ -1,59 +0,0 @@ -error: expected identifier, found `1234test` - --> $DIR/issue-104088.rs:1:4 - | -LL | fn 1234test() { - | ^^^^^^^^ expected identifier - | -help: identifiers cannot start with a number - --> $DIR/issue-104088.rs:1:4 - | -LL | fn 1234test() { - | ^^^^ - -error: expected identifier, found `23name` - --> $DIR/issue-104088.rs:9:9 - | -LL | let 23name = 123; - | ^^^^^^ expected identifier - | -help: identifiers cannot start with a number - --> $DIR/issue-104088.rs:9:9 - | -LL | let 23name = 123; - | ^^ - -error: expected identifier, found `2x` - --> $DIR/issue-104088.rs:12:9 - | -LL | let 2x: i32 = 123; - | ^^ expected identifier - | -help: identifiers cannot start with a number - --> $DIR/issue-104088.rs:12:9 - | -LL | let 2x: i32 = 123; - | ^ - -error: expected identifier, found `1x` - --> $DIR/issue-104088.rs:15:9 - | -LL | let 1x = 123; - | ^^ expected identifier - | -help: identifiers cannot start with a number - --> $DIR/issue-104088.rs:15:9 - | -LL | let 1x = 123; - | ^ - -error[E0308]: mismatched types - --> $DIR/issue-104088.rs:5:12 - | -LL | if let 2e1 = 123 { - | ^^^ --- this expression has type `{integer}` - | | - | expected integer, found floating-point number - -error: aborting due to 5 previous errors - -For more information about this error, try `rustc --explain E0308`. diff --git a/tests/ui/parser/issues/issue-104620.rs b/tests/ui/parser/issues/issue-104620.rs index f49476c44..fd0916b44 100644 --- a/tests/ui/parser/issues/issue-104620.rs +++ b/tests/ui/parser/issues/issue-104620.rs @@ -1,4 +1,4 @@ #![feature(rustc_attrs)] -#![rustc_dummy=5z] //~ ERROR unexpected expression: `5z` +#![rustc_dummy=5z] //~ ERROR invalid suffix `z` for number literal fn main() {} diff --git a/tests/ui/parser/issues/issue-104620.stderr b/tests/ui/parser/issues/issue-104620.stderr index d06a6b255..040c63a5f 100644 --- a/tests/ui/parser/issues/issue-104620.stderr +++ b/tests/ui/parser/issues/issue-104620.stderr @@ -1,8 +1,10 @@ -error: unexpected expression: `5z` +error: invalid suffix `z` for number literal --> $DIR/issue-104620.rs:3:16 | LL | #![rustc_dummy=5z] - | ^^ + | ^^ invalid suffix `z` + | + = help: the suffix must be one of the numeric types (`u32`, `isize`, `f32`, etc.) -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-105366.stderr b/tests/ui/parser/issues/issue-105366.stderr index 0a7408e2c..18c04dfaf 100644 --- a/tests/ui/parser/issues/issue-105366.stderr +++ b/tests/ui/parser/issues/issue-105366.stderr @@ -9,5 +9,5 @@ help: replace `fn` with `impl` here LL | impl From for Foo { | ~~~~ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-10636-1.stderr b/tests/ui/parser/issues/issue-10636-1.stderr index 1e6294ebe..a7402e071 100644 --- a/tests/ui/parser/issues/issue-10636-1.stderr +++ b/tests/ui/parser/issues/issue-10636-1.stderr @@ -7,5 +7,5 @@ LL | struct Obj { LL | ) | ^ mismatched closing delimiter -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-10636-2.stderr b/tests/ui/parser/issues/issue-10636-2.stderr index 4cd4be180..2dc615246 100644 --- a/tests/ui/parser/issues/issue-10636-2.stderr +++ b/tests/ui/parser/issues/issue-10636-2.stderr @@ -9,5 +9,5 @@ LL | option.map(|some| 42; LL | } | ^ mismatched closing delimiter -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-107705.stderr b/tests/ui/parser/issues/issue-107705.stderr index d2d613461..2d0c3e0e6 100644 --- a/tests/ui/parser/issues/issue-107705.stderr +++ b/tests/ui/parser/issues/issue-107705.stderr @@ -6,5 +6,5 @@ LL | fn f() {a(b:&, | | | unclosed delimiter -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-108109-fn-trait-missing-paren.stderr b/tests/ui/parser/issues/issue-108109-fn-trait-missing-paren.stderr index 7cda66757..78017babb 100644 --- a/tests/ui/parser/issues/issue-108109-fn-trait-missing-paren.stderr +++ b/tests/ui/parser/issues/issue-108109-fn-trait-missing-paren.stderr @@ -7,5 +7,5 @@ LL | pub fn func() where F: FnOnce -> () {} | | help: try adding parentheses | `Fn` bounds require arguments in parentheses -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-108242-semicolon-recovery.stderr b/tests/ui/parser/issues/issue-108242-semicolon-recovery.stderr index f68d6d501..e12283b25 100644 --- a/tests/ui/parser/issues/issue-108242-semicolon-recovery.stderr +++ b/tests/ui/parser/issues/issue-108242-semicolon-recovery.stderr @@ -9,5 +9,5 @@ LL | foo(; LL | } | ^ mismatched closing delimiter -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-111148.stderr b/tests/ui/parser/issues/issue-111148.stderr index e6595a5cb..bcfca981d 100644 --- a/tests/ui/parser/issues/issue-111148.stderr +++ b/tests/ui/parser/issues/issue-111148.stderr @@ -4,5 +4,5 @@ error: expected one of `#`, `>`, `const`, identifier, or lifetime, found `<` LL | fn a<# | ^ expected one of `#`, `>`, `const`, identifier, or lifetime -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-111416.stderr b/tests/ui/parser/issues/issue-111416.stderr index ddacf4d6d..36f6c5b01 100644 --- a/tests/ui/parser/issues/issue-111416.stderr +++ b/tests/ui/parser/issues/issue-111416.stderr @@ -14,5 +14,5 @@ LL - let my = monad_bind(mx, T: Try); LL + let my = monad_bind(mx, Try); | -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-113110-non-item-at-module-root.stderr b/tests/ui/parser/issues/issue-113110-non-item-at-module-root.stderr index 0789c4548..a47dd4103 100644 --- a/tests/ui/parser/issues/issue-113110-non-item-at-module-root.stderr +++ b/tests/ui/parser/issues/issue-113110-non-item-at-module-root.stderr @@ -6,5 +6,5 @@ LL | 5 | = note: for a full list of items that can appear in modules, see -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-113203.stderr b/tests/ui/parser/issues/issue-113203.stderr index 97304a89c..5db628d59 100644 --- a/tests/ui/parser/issues/issue-113203.stderr +++ b/tests/ui/parser/issues/issue-113203.stderr @@ -4,5 +4,5 @@ error: incorrect use of `await` LL | await {}() | ^^^^^^^^ help: `await` is a postfix operation: `{}.await` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-113342.stderr b/tests/ui/parser/issues/issue-113342.stderr index a0c5e665f..6d9f22f6a 100644 --- a/tests/ui/parser/issues/issue-113342.stderr +++ b/tests/ui/parser/issues/issue-113342.stderr @@ -7,5 +7,5 @@ LL | extern "C" pub fn id(x: i32) -> i32 { x } | | expected `fn` | help: visibility `pub` must come before `extern "C"`: `pub extern "C"` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-114219.stderr b/tests/ui/parser/issues/issue-114219.stderr index 90dcdc427..02323cb99 100644 --- a/tests/ui/parser/issues/issue-114219.stderr +++ b/tests/ui/parser/issues/issue-114219.stderr @@ -4,5 +4,5 @@ error: `async move` blocks are only allowed in Rust 2018 or later LL | async move {}; | ^^^^^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-118530-ice.rs b/tests/ui/parser/issues/issue-118530-ice.rs new file mode 100644 index 000000000..e758e5af4 --- /dev/null +++ b/tests/ui/parser/issues/issue-118530-ice.rs @@ -0,0 +1,15 @@ +fn bar() -> String { + #[cfg] + [1, 2, 3].iter() //~ ERROR expected `;`, found `#` + #[feature] + attr::fn bar() -> String { //~ ERROR expected identifier, found keyword `fn` + //~^ ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found `->` + //~| ERROR expected `;`, found `bar` + #[attr] + [1, 2, 3].iter().map().collect::() + #[attr] + +}() +} + +fn main() { } diff --git a/tests/ui/parser/issues/issue-118530-ice.stderr b/tests/ui/parser/issues/issue-118530-ice.stderr new file mode 100644 index 000000000..ef573fb7b --- /dev/null +++ b/tests/ui/parser/issues/issue-118530-ice.stderr @@ -0,0 +1,43 @@ +error: expected `;`, found `#` + --> $DIR/issue-118530-ice.rs:3:21 + | +LL | #[cfg] + | ------ only `;` terminated statements or tail expressions are allowed after this attribute +LL | [1, 2, 3].iter() + | ^ expected `;` here +LL | #[feature] + | - unexpected token + | +help: add `;` here + | +LL | [1, 2, 3].iter(); + | + +help: alternatively, consider surrounding the expression with a block + | +LL | { [1, 2, 3].iter() } + | + + + +error: expected identifier, found keyword `fn` + --> $DIR/issue-118530-ice.rs:5:11 + | +LL | attr::fn bar() -> String { + | ^^ expected identifier, found keyword + +error: expected `;`, found `bar` + --> $DIR/issue-118530-ice.rs:5:13 + | +LL | #[feature] + | ---------- only `;` terminated statements or tail expressions are allowed after this attribute +LL | attr::fn bar() -> String { + | ^--- unexpected token + | | + | help: add `;` here + +error: expected one of `.`, `;`, `?`, `}`, or an operator, found `->` + --> $DIR/issue-118530-ice.rs:5:20 + | +LL | attr::fn bar() -> String { + | ^^ expected one of `.`, `;`, `?`, `}`, or an operator + +error: aborting due to 4 previous errors + diff --git a/tests/ui/parser/issues/issue-118531-ice.rs b/tests/ui/parser/issues/issue-118531-ice.rs new file mode 100644 index 000000000..24794f060 --- /dev/null +++ b/tests/ui/parser/issues/issue-118531-ice.rs @@ -0,0 +1,10 @@ +fn bar() -> String { + #[cfg(feature = )] + [1, 2, 3].iter().map().collect::() //~ ERROR expected `;`, found `#` + + #[attr] //~ ERROR attributes on expressions are experimental [E0658] + //~^ ERROR cannot find attribute `attr` in this scope + String::new() +} + +fn main() { } diff --git a/tests/ui/parser/issues/issue-118531-ice.stderr b/tests/ui/parser/issues/issue-118531-ice.stderr new file mode 100644 index 000000000..a32292dcb --- /dev/null +++ b/tests/ui/parser/issues/issue-118531-ice.stderr @@ -0,0 +1,38 @@ +error: expected `;`, found `#` + --> $DIR/issue-118531-ice.rs:3:47 + | +LL | #[cfg(feature = )] + | ------------------ only `;` terminated statements or tail expressions are allowed after this attribute +LL | [1, 2, 3].iter().map().collect::() + | ^ expected `;` here +LL | +LL | #[attr] + | - unexpected token + | +help: add `;` here + | +LL | [1, 2, 3].iter().map().collect::(); + | + +help: alternatively, consider surrounding the expression with a block + | +LL | { [1, 2, 3].iter().map().collect::() } + | + + + +error[E0658]: attributes on expressions are experimental + --> $DIR/issue-118531-ice.rs:5:5 + | +LL | #[attr] + | ^^^^^^^ + | + = note: see issue #15701 for more information + = help: add `#![feature(stmt_expr_attributes)]` to the crate attributes to enable + +error: cannot find attribute `attr` in this scope + --> $DIR/issue-118531-ice.rs:5:7 + | +LL | #[attr] + | ^^^^ + +error: aborting due to 3 previous errors + +For more information about this error, try `rustc --explain E0658`. diff --git a/tests/ui/parser/issues/issue-14303-fncall.full.stderr b/tests/ui/parser/issues/issue-14303-fncall.full.stderr index 0c152516a..1986f70bf 100644 --- a/tests/ui/parser/issues/issue-14303-fncall.full.stderr +++ b/tests/ui/parser/issues/issue-14303-fncall.full.stderr @@ -4,6 +4,6 @@ error[E0747]: type provided when a lifetime was expected LL | .collect::>>(); | ^ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0747`. diff --git a/tests/ui/parser/issues/issue-14303-fncall.generic_arg.stderr b/tests/ui/parser/issues/issue-14303-fncall.generic_arg.stderr index 571815776..2de59b8c7 100644 --- a/tests/ui/parser/issues/issue-14303-fncall.generic_arg.stderr +++ b/tests/ui/parser/issues/issue-14303-fncall.generic_arg.stderr @@ -4,6 +4,6 @@ error[E0747]: inferred provided when a lifetime was expected LL | .collect::>>(); | ^ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0747`. diff --git a/tests/ui/parser/issues/issue-15914.stderr b/tests/ui/parser/issues/issue-15914.stderr index ea26453f8..c88fd4e55 100644 --- a/tests/ui/parser/issues/issue-15914.stderr +++ b/tests/ui/parser/issues/issue-15914.stderr @@ -4,5 +4,5 @@ error: expected identifier, found `(` LL | (); | ^ expected identifier -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-15980.stderr b/tests/ui/parser/issues/issue-15980.stderr index cf8d01147..c3c56c46a 100644 --- a/tests/ui/parser/issues/issue-15980.stderr +++ b/tests/ui/parser/issues/issue-15980.stderr @@ -16,5 +16,5 @@ help: you might have meant to start a match arm after the match guard LL | Err(ref e) if e.kind == io::EndOfFile => { | ++ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-1655.stderr b/tests/ui/parser/issues/issue-1655.stderr index 0c390a0ec..536b583aa 100644 --- a/tests/ui/parser/issues/issue-1655.stderr +++ b/tests/ui/parser/issues/issue-1655.stderr @@ -4,5 +4,5 @@ error: expected one of `!` or `[`, found `vec` LL | #vec[doc( | ^^^ expected one of `!` or `[` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-17718-const-mut.stderr b/tests/ui/parser/issues/issue-17718-const-mut.stderr index 8251ce999..a27f51708 100644 --- a/tests/ui/parser/issues/issue-17718-const-mut.stderr +++ b/tests/ui/parser/issues/issue-17718-const-mut.stderr @@ -6,5 +6,5 @@ LL | const LL | mut | ^^^ cannot be mutable -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-17904-2.stderr b/tests/ui/parser/issues/issue-17904-2.stderr index 7185a5e57..211ffcedd 100644 --- a/tests/ui/parser/issues/issue-17904-2.stderr +++ b/tests/ui/parser/issues/issue-17904-2.stderr @@ -6,5 +6,5 @@ LL | struct Bar { x: T } where T: Copy | = note: for a full list of items that can appear in modules, see -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-17904.stderr b/tests/ui/parser/issues/issue-17904.stderr index aa343975d..81c6e3bed 100644 --- a/tests/ui/parser/issues/issue-17904.stderr +++ b/tests/ui/parser/issues/issue-17904.stderr @@ -13,5 +13,5 @@ LL - struct Foo where T: Copy, (T); LL + struct Foo(T) where T: Copy; | -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-1802-1.stderr b/tests/ui/parser/issues/issue-1802-1.stderr index 954cc0bee..5ddc5ae58 100644 --- a/tests/ui/parser/issues/issue-1802-1.stderr +++ b/tests/ui/parser/issues/issue-1802-1.stderr @@ -4,6 +4,6 @@ error[E0768]: no valid digits found for number LL | log(error, 0b); | ^^ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0768`. diff --git a/tests/ui/parser/issues/issue-1802-2.stderr b/tests/ui/parser/issues/issue-1802-2.stderr index 49043d07b..7c802e4bd 100644 --- a/tests/ui/parser/issues/issue-1802-2.stderr +++ b/tests/ui/parser/issues/issue-1802-2.stderr @@ -4,6 +4,6 @@ error[E0768]: no valid digits found for number LL | log(error, 0b); | ^^ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0768`. diff --git a/tests/ui/parser/issues/issue-19398.stderr b/tests/ui/parser/issues/issue-19398.stderr index 1da00960a..236fac673 100644 --- a/tests/ui/parser/issues/issue-19398.stderr +++ b/tests/ui/parser/issues/issue-19398.stderr @@ -9,5 +9,5 @@ LL | LL | } | - the item list ends here -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-20616-1.stderr b/tests/ui/parser/issues/issue-20616-1.stderr index 816046237..b7a8d22d8 100644 --- a/tests/ui/parser/issues/issue-20616-1.stderr +++ b/tests/ui/parser/issues/issue-20616-1.stderr @@ -4,5 +4,5 @@ error: expected one of `,`, `:`, or `>`, found `T` LL | type Type_1<'a T> = &'a T; | ^ expected one of `,`, `:`, or `>` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-20616-2.stderr b/tests/ui/parser/issues/issue-20616-2.stderr index 42059685c..038b2ffc7 100644 --- a/tests/ui/parser/issues/issue-20616-2.stderr +++ b/tests/ui/parser/issues/issue-20616-2.stderr @@ -9,5 +9,5 @@ help: you might have meant to end the type parameters here LL | type Type_2 = Type_1_<'static> ()>; | + -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-20616-3.stderr b/tests/ui/parser/issues/issue-20616-3.stderr index dbff116e5..10e5befe2 100644 --- a/tests/ui/parser/issues/issue-20616-3.stderr +++ b/tests/ui/parser/issues/issue-20616-3.stderr @@ -9,5 +9,5 @@ help: you might have meant to end the type parameters here LL | type Type_3 = Box,,>; | + -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-20616-4.stderr b/tests/ui/parser/issues/issue-20616-4.stderr index 48a06e00b..df619b4c7 100644 --- a/tests/ui/parser/issues/issue-20616-4.stderr +++ b/tests/ui/parser/issues/issue-20616-4.stderr @@ -9,5 +9,5 @@ help: you might have meant to end the type parameters here LL | type Type_4 = Type_1_<'static>,, T>; | + -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-20616-5.stderr b/tests/ui/parser/issues/issue-20616-5.stderr index 84bee2ad1..709a5467d 100644 --- a/tests/ui/parser/issues/issue-20616-5.stderr +++ b/tests/ui/parser/issues/issue-20616-5.stderr @@ -9,5 +9,5 @@ help: you might have meant to end the type parameters here LL | type Type_5<'a> = Type_1_<'a, ()>,,>; | + -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-20616-6.stderr b/tests/ui/parser/issues/issue-20616-6.stderr index 67de41b97..7fe1f1c45 100644 --- a/tests/ui/parser/issues/issue-20616-6.stderr +++ b/tests/ui/parser/issues/issue-20616-6.stderr @@ -9,5 +9,5 @@ help: you might have meant to end the type parameters here LL | type Type_6 = Type_5_<'a>,,>; | + -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-20616-7.stderr b/tests/ui/parser/issues/issue-20616-7.stderr index 3b8e07fa0..d9e97301f 100644 --- a/tests/ui/parser/issues/issue-20616-7.stderr +++ b/tests/ui/parser/issues/issue-20616-7.stderr @@ -9,5 +9,5 @@ help: you might have meant to end the type parameters here LL | type Type_7 = Box<()>,,>; | + -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-20616-8.stderr b/tests/ui/parser/issues/issue-20616-8.stderr index e9f37e50f..f8d7dc63c 100644 --- a/tests/ui/parser/issues/issue-20616-8.stderr +++ b/tests/ui/parser/issues/issue-20616-8.stderr @@ -4,5 +4,5 @@ error: expected one of `#`, `>`, `const`, identifier, or lifetime, found `,` LL | type Type_8<'a,,> = &'a (); | ^ expected one of `#`, `>`, `const`, identifier, or lifetime -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-20616-9.stderr b/tests/ui/parser/issues/issue-20616-9.stderr index dc309d1bc..5dccacdb6 100644 --- a/tests/ui/parser/issues/issue-20616-9.stderr +++ b/tests/ui/parser/issues/issue-20616-9.stderr @@ -4,5 +4,5 @@ error: expected one of `#`, `>`, `const`, identifier, or lifetime, found `,` LL | type Type_9 = Box; | ^ expected one of `#`, `>`, `const`, identifier, or lifetime -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-20711-2.stderr b/tests/ui/parser/issues/issue-20711-2.stderr index 12b18bbc5..9fb729895 100644 --- a/tests/ui/parser/issues/issue-20711-2.stderr +++ b/tests/ui/parser/issues/issue-20711-2.stderr @@ -10,5 +10,5 @@ LL | LL | } | - the item list ends here -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-20711.stderr b/tests/ui/parser/issues/issue-20711.stderr index 4af4b22be..256fb0ade 100644 --- a/tests/ui/parser/issues/issue-20711.stderr +++ b/tests/ui/parser/issues/issue-20711.stderr @@ -9,5 +9,5 @@ LL | LL | } | - the item list ends here -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-21146.stderr b/tests/ui/parser/issues/issue-21146.stderr index c71fda3d6..e83c62afe 100644 --- a/tests/ui/parser/issues/issue-21146.stderr +++ b/tests/ui/parser/issues/issue-21146.stderr @@ -4,5 +4,5 @@ error: expected one of `!` or `::`, found `` LL | parse_error | ^^^^^^^^^^^ expected one of `!` or `::` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-21153.stderr b/tests/ui/parser/issues/issue-21153.stderr index cbfa9ded3..8839eed84 100644 --- a/tests/ui/parser/issues/issue-21153.stderr +++ b/tests/ui/parser/issues/issue-21153.stderr @@ -9,5 +9,5 @@ LL | LL | } | - the item list ends here -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-22647.stderr b/tests/ui/parser/issues/issue-22647.stderr index 585e70266..bdf74af63 100644 --- a/tests/ui/parser/issues/issue-22647.stderr +++ b/tests/ui/parser/issues/issue-22647.stderr @@ -9,5 +9,5 @@ help: use `::<...>` instead of `<...>` to specify lifetime, type, or const argum LL | let caller:: = |f: F| | ++ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-22712.stderr b/tests/ui/parser/issues/issue-22712.stderr index 7f9d99d8e..aeca95ed6 100644 --- a/tests/ui/parser/issues/issue-22712.stderr +++ b/tests/ui/parser/issues/issue-22712.stderr @@ -9,5 +9,5 @@ help: use `::<...>` instead of `<...>` to specify lifetime, type, or const argum LL | let Foo::> | ++ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-2354-1.stderr b/tests/ui/parser/issues/issue-2354-1.stderr index 7ea0f2a98..edd64ecf3 100644 --- a/tests/ui/parser/issues/issue-2354-1.stderr +++ b/tests/ui/parser/issues/issue-2354-1.stderr @@ -4,5 +4,5 @@ error: unexpected closing delimiter: `}` LL | static foo: isize = 2; } | ^ unexpected closing delimiter -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-2354.stderr b/tests/ui/parser/issues/issue-2354.stderr index b89ed3958..fd649a575 100644 --- a/tests/ui/parser/issues/issue-2354.stderr +++ b/tests/ui/parser/issues/issue-2354.stderr @@ -12,5 +12,5 @@ LL | } LL | | ^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-24197.stderr b/tests/ui/parser/issues/issue-24197.stderr index fd7015ccd..3ef707f39 100644 --- a/tests/ui/parser/issues/issue-24197.stderr +++ b/tests/ui/parser/issues/issue-24197.stderr @@ -4,5 +4,5 @@ error: expected one of `:`, `;`, `=`, `@`, or `|`, found `[` LL | let buf[0] = 0; | ^ expected one of `:`, `;`, `=`, `@`, or `|` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-24375.rs b/tests/ui/parser/issues/issue-24375.rs index 1d128d33e..8d1bc579e 100644 --- a/tests/ui/parser/issues/issue-24375.rs +++ b/tests/ui/parser/issues/issue-24375.rs @@ -3,7 +3,7 @@ static tmp : [&'static str; 2] = ["hello", "he"]; fn main() { let z = "hello"; match z { - tmp[0] => {} //~ ERROR expected one of `=>`, `@`, `if`, or `|`, found `[` + tmp[0] => {} //~ ERROR expected one of `,`, `=>`, `@`, `if`, `|`, or `}`, found `[` _ => {} } } diff --git a/tests/ui/parser/issues/issue-24375.stderr b/tests/ui/parser/issues/issue-24375.stderr index 7aed88768..2b980a552 100644 --- a/tests/ui/parser/issues/issue-24375.stderr +++ b/tests/ui/parser/issues/issue-24375.stderr @@ -1,8 +1,8 @@ -error: expected one of `=>`, `@`, `if`, or `|`, found `[` +error: expected one of `,`, `=>`, `@`, `if`, `|`, or `}`, found `[` --> $DIR/issue-24375.rs:6:12 | LL | tmp[0] => {} - | ^ expected one of `=>`, `@`, `if`, or `|` + | ^ expected one of `,`, `=>`, `@`, `if`, `|`, or `}` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-24780.stderr b/tests/ui/parser/issues/issue-24780.stderr index d9470191b..43e200102 100644 --- a/tests/ui/parser/issues/issue-24780.stderr +++ b/tests/ui/parser/issues/issue-24780.stderr @@ -4,5 +4,5 @@ error: expected one of `!`, `+`, `::`, `where`, or `{`, found `>` LL | fn foo() -> Vec> { | ^ expected one of `!`, `+`, `::`, `where`, or `{` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-3036.stderr b/tests/ui/parser/issues/issue-3036.stderr index e02223931..3dd89b7e8 100644 --- a/tests/ui/parser/issues/issue-3036.stderr +++ b/tests/ui/parser/issues/issue-3036.stderr @@ -6,5 +6,5 @@ LL | let _x = 3 LL | } | - unexpected token -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-31804.stderr b/tests/ui/parser/issues/issue-31804.stderr index 76e68b0b3..d3d2c2a0f 100644 --- a/tests/ui/parser/issues/issue-31804.stderr +++ b/tests/ui/parser/issues/issue-31804.stderr @@ -4,5 +4,5 @@ error: expected pattern, found `}` LL | } | ^ expected pattern -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-32214.stderr b/tests/ui/parser/issues/issue-32214.stderr index d0a9b5299..2ef4305df 100644 --- a/tests/ui/parser/issues/issue-32214.stderr +++ b/tests/ui/parser/issues/issue-32214.stderr @@ -11,5 +11,5 @@ help: move the constraint after the generic argument LL | pub fn test >() {} | ~~~~~~~~~~~~~~ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-32446.stderr b/tests/ui/parser/issues/issue-32446.stderr index 7515369aa..7319e839b 100644 --- a/tests/ui/parser/issues/issue-32446.stderr +++ b/tests/ui/parser/issues/issue-32446.stderr @@ -7,5 +7,5 @@ LL | trait T { ... } | | non-item starts here | item list starts here -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-32501.stderr b/tests/ui/parser/issues/issue-32501.stderr index d53302449..c0513a640 100644 --- a/tests/ui/parser/issues/issue-32501.stderr +++ b/tests/ui/parser/issues/issue-32501.stderr @@ -2,9 +2,9 @@ error: `mut` must be followed by a named binding --> $DIR/issue-32501.rs:7:9 | LL | let mut _ = 0; - | ^^^^^ help: remove the `mut` prefix: `_` + | ^^^^ help: remove the `mut` prefix | = note: `mut` may be followed by `variable` and `variable @ pattern` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-33262.stderr b/tests/ui/parser/issues/issue-33262.stderr index 2aff32839..ec4934eb7 100644 --- a/tests/ui/parser/issues/issue-33262.stderr +++ b/tests/ui/parser/issues/issue-33262.stderr @@ -4,5 +4,5 @@ error: expected type, found `{` LL | for i in 0..a as { } | ^ expected type -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-33455.stderr b/tests/ui/parser/issues/issue-33455.stderr index c535ef23b..573614a5e 100644 --- a/tests/ui/parser/issues/issue-33455.stderr +++ b/tests/ui/parser/issues/issue-33455.stderr @@ -4,5 +4,5 @@ error: expected one of `::`, `;`, or `as`, found `.` LL | use foo.bar; | ^ expected one of `::`, `;`, or `as` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-34222-1.stderr b/tests/ui/parser/issues/issue-34222-1.stderr index b451484ba..b2a6ae93a 100644 --- a/tests/ui/parser/issues/issue-34222-1.stderr +++ b/tests/ui/parser/issues/issue-34222-1.stderr @@ -6,6 +6,6 @@ LL | /// comment | = help: doc comments must come before what they document, if a comment was intended use `//` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0585`. diff --git a/tests/ui/parser/issues/issue-34255-1.stderr b/tests/ui/parser/issues/issue-34255-1.stderr index 0e2b0d62e..1e72f040b 100644 --- a/tests/ui/parser/issues/issue-34255-1.stderr +++ b/tests/ui/parser/issues/issue-34255-1.stderr @@ -14,5 +14,5 @@ LL - Test::Drill(field: 42); LL + Test::Drill(42); | -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-39616.stderr b/tests/ui/parser/issues/issue-39616.stderr index 393d1f2e2..da85bcb44 100644 --- a/tests/ui/parser/issues/issue-39616.stderr +++ b/tests/ui/parser/issues/issue-39616.stderr @@ -4,5 +4,5 @@ error: expected type, found `0` LL | fn foo(a: [0; 1]) {} | ^ expected type -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-43692.stderr b/tests/ui/parser/issues/issue-43692.stderr index baf998035..1ce3aa671 100644 --- a/tests/ui/parser/issues/issue-43692.stderr +++ b/tests/ui/parser/issues/issue-43692.stderr @@ -4,5 +4,5 @@ error: invalid start of unicode escape: `_` LL | '\u{_10FFFF}'; | ^ invalid start of unicode escape -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-44021.stderr b/tests/ui/parser/issues/issue-44021.stderr index b888cd989..8a9326f90 100644 --- a/tests/ui/parser/issues/issue-44021.stderr +++ b/tests/ui/parser/issues/issue-44021.stderr @@ -4,5 +4,5 @@ error: expected one of `:`, `@`, or `|`, found `}` LL | fn f() {|x, y} | ^ expected one of `:`, `@`, or `|` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-44406.stderr b/tests/ui/parser/issues/issue-44406.stderr index 69ff64c27..d005f116e 100644 --- a/tests/ui/parser/issues/issue-44406.stderr +++ b/tests/ui/parser/issues/issue-44406.stderr @@ -18,5 +18,5 @@ LL - bar(baz: $rest) LL + bar(: $rest) | -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-45296.stderr b/tests/ui/parser/issues/issue-45296.stderr index 081a72054..1d2281df1 100644 --- a/tests/ui/parser/issues/issue-45296.stderr +++ b/tests/ui/parser/issues/issue-45296.stderr @@ -13,5 +13,5 @@ LL - #![allow(unused_variables)] LL + #[allow(unused_variables)] | -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-46186.stderr b/tests/ui/parser/issues/issue-46186.stderr index 0766c8a33..c67c271e1 100644 --- a/tests/ui/parser/issues/issue-46186.stderr +++ b/tests/ui/parser/issues/issue-46186.stderr @@ -6,5 +6,5 @@ LL | }; | = help: braced struct declarations are not followed by a semicolon -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-48508.rs b/tests/ui/parser/issues/issue-48508.rs index 1e7db9df8..b66e09620 100644 --- a/tests/ui/parser/issues/issue-48508.rs +++ b/tests/ui/parser/issues/issue-48508.rs @@ -7,7 +7,6 @@ // issue-48508-aux.rs // compile-flags:-g -// ignore-asmjs wasm2js does not support source maps yet #![allow(uncommon_codepoints)] diff --git a/tests/ui/parser/issues/issue-48636.stderr b/tests/ui/parser/issues/issue-48636.stderr index 6177870d1..488a046a5 100644 --- a/tests/ui/parser/issues/issue-48636.stderr +++ b/tests/ui/parser/issues/issue-48636.stderr @@ -10,6 +10,6 @@ LL | /// The ID of the parent core | = help: doc comments must come before what they document, if a comment was intended use `//` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0585`. diff --git a/tests/ui/parser/issues/issue-51602.stderr b/tests/ui/parser/issues/issue-51602.stderr index 4a5653fdb..7b50e0ad0 100644 --- a/tests/ui/parser/issues/issue-51602.stderr +++ b/tests/ui/parser/issues/issue-51602.stderr @@ -10,5 +10,5 @@ note: the `if` expression is missing a block after this condition LL | if i in 1..10 { | ^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-5544-a.stderr b/tests/ui/parser/issues/issue-5544-a.stderr index 6e68c7585..aeb134600 100644 --- a/tests/ui/parser/issues/issue-5544-a.stderr +++ b/tests/ui/parser/issues/issue-5544-a.stderr @@ -6,5 +6,5 @@ LL | let __isize = 340282366920938463463374607431768211456; // 2^128 | = note: value exceeds limit of `340282366920938463463374607431768211455` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-5544-b.stderr b/tests/ui/parser/issues/issue-5544-b.stderr index 5d0e76d5d..65e6f196b 100644 --- a/tests/ui/parser/issues/issue-5544-b.stderr +++ b/tests/ui/parser/issues/issue-5544-b.stderr @@ -6,5 +6,5 @@ LL | let __isize = 0xffff_ffff_ffff_ffff_ffff_ffff_ffff_ffff_ff; | = note: value exceeds limit of `0xffffffffffffffffffffffffffffffff` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-56031.stderr b/tests/ui/parser/issues/issue-56031.stderr index 2fa05dd2d..8031bf82f 100644 --- a/tests/ui/parser/issues/issue-56031.stderr +++ b/tests/ui/parser/issues/issue-56031.stderr @@ -14,5 +14,5 @@ LL - impl for T {} LL + impl T {} | -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-57198.stderr b/tests/ui/parser/issues/issue-57198.stderr index dd70b4022..dca0d3ea4 100644 --- a/tests/ui/parser/issues/issue-57198.stderr +++ b/tests/ui/parser/issues/issue-57198.stderr @@ -9,5 +9,5 @@ help: escape `for` to use it as an identifier LL | m::r#for(); | ++ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-5806.stderr b/tests/ui/parser/issues/issue-5806.stderr index bdb5c91ff..4b025bd19 100644 --- a/tests/ui/parser/issues/issue-5806.stderr +++ b/tests/ui/parser/issues/issue-5806.stderr @@ -4,5 +4,5 @@ error: couldn't read $DIR/../parser: $ACCESS_DENIED_MSG (os error $ACCESS_DENIED LL | mod foo; | ^^^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-58094-missing-right-square-bracket.rs b/tests/ui/parser/issues/issue-58094-missing-right-square-bracket.rs index a596a9f2d..a2ea8ad36 100644 --- a/tests/ui/parser/issues/issue-58094-missing-right-square-bracket.rs +++ b/tests/ui/parser/issues/issue-58094-missing-right-square-bracket.rs @@ -1,5 +1,5 @@ // Fixed in #66054. // ignore-tidy-trailing-newlines // error-pattern: this file contains an unclosed delimiter -// error-pattern: aborting due to previous error +// error-pattern: aborting due to 1 previous error #[Ѕ \ No newline at end of file diff --git a/tests/ui/parser/issues/issue-58094-missing-right-square-bracket.stderr b/tests/ui/parser/issues/issue-58094-missing-right-square-bracket.stderr index c79e8b4fb..14f5469f6 100644 --- a/tests/ui/parser/issues/issue-58094-missing-right-square-bracket.stderr +++ b/tests/ui/parser/issues/issue-58094-missing-right-square-bracket.stderr @@ -6,5 +6,5 @@ LL | #[Ѕ | | | unclosed delimiter -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-58856-1.stderr b/tests/ui/parser/issues/issue-58856-1.stderr index 77ad8acbd..2c3334391 100644 --- a/tests/ui/parser/issues/issue-58856-1.stderr +++ b/tests/ui/parser/issues/issue-58856-1.stderr @@ -8,5 +8,5 @@ LL | fn b(self> LL | } | ^ mismatched closing delimiter -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-58856-2.stderr b/tests/ui/parser/issues/issue-58856-2.stderr index 5fcf5bcc1..d3255fca0 100644 --- a/tests/ui/parser/issues/issue-58856-2.stderr +++ b/tests/ui/parser/issues/issue-58856-2.stderr @@ -9,5 +9,5 @@ LL | fn how_are_you(&self -> Empty { LL | } | ^ mismatched closing delimiter -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-60075.stderr b/tests/ui/parser/issues/issue-60075.stderr index cd8f1231f..b40412aba 100644 --- a/tests/ui/parser/issues/issue-60075.stderr +++ b/tests/ui/parser/issues/issue-60075.stderr @@ -7,5 +7,5 @@ LL | let _ = if true { LL | }); | ^ mismatched closing delimiter -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-61858.stderr b/tests/ui/parser/issues/issue-61858.stderr index 03f51c6e3..6bdfec938 100644 --- a/tests/ui/parser/issues/issue-61858.stderr +++ b/tests/ui/parser/issues/issue-61858.stderr @@ -10,5 +10,5 @@ note: the `if` expression is missing a block after this condition LL | (if foobar) | ^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-62524.rs b/tests/ui/parser/issues/issue-62524.rs index fa7c626f5..dd86fc9a7 100644 --- a/tests/ui/parser/issues/issue-62524.rs +++ b/tests/ui/parser/issues/issue-62524.rs @@ -1,5 +1,5 @@ // ignore-tidy-trailing-newlines -// error-pattern: aborting due to previous error +// error-pattern: aborting due to 1 previous error #![allow(uncommon_codepoints)] y![ diff --git a/tests/ui/parser/issues/issue-62524.stderr b/tests/ui/parser/issues/issue-62524.stderr index 0cbaacd4c..d83a49aed 100644 --- a/tests/ui/parser/issues/issue-62524.stderr +++ b/tests/ui/parser/issues/issue-62524.stderr @@ -6,5 +6,5 @@ LL | y![ LL | Ϥ, | ^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-62546.stderr b/tests/ui/parser/issues/issue-62546.stderr index 80c1c7168..6889cb3b8 100644 --- a/tests/ui/parser/issues/issue-62546.stderr +++ b/tests/ui/parser/issues/issue-62546.stderr @@ -4,5 +4,5 @@ error: this file contains an unclosed delimiter LL | pub t(# | - unclosed delimiter ^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-62554.stderr b/tests/ui/parser/issues/issue-62554.stderr index 4637c795a..37314dd39 100644 --- a/tests/ui/parser/issues/issue-62554.stderr +++ b/tests/ui/parser/issues/issue-62554.stderr @@ -9,5 +9,5 @@ LL | fn foo(u: u8) { if u8 macro_rules! u8 { (u6) => { fn uuuuuuuuuuu() { use s | | | unclosed delimiter | unclosed delimiter unclosed delimiter -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-62660.stderr b/tests/ui/parser/issues/issue-62660.stderr index 14c0bdcb1..310b433f2 100644 --- a/tests/ui/parser/issues/issue-62660.stderr +++ b/tests/ui/parser/issues/issue-62660.stderr @@ -9,5 +9,5 @@ help: you might have meant to end the type parameters here LL | pub fn foo(_: i32, self: Box) {} | + -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-62881.stderr b/tests/ui/parser/issues/issue-62881.stderr index e57cbd181..2165a81a0 100644 --- a/tests/ui/parser/issues/issue-62881.stderr +++ b/tests/ui/parser/issues/issue-62881.stderr @@ -4,5 +4,5 @@ error: this file contains an unclosed delimiter LL | fn f() -> isize { fn f() -> isize {} pub f< | - unclosed delimiter ^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-62894.stderr b/tests/ui/parser/issues/issue-62894.stderr index 700479076..870633fc9 100644 --- a/tests/ui/parser/issues/issue-62894.stderr +++ b/tests/ui/parser/issues/issue-62894.stderr @@ -10,5 +10,5 @@ LL | LL | fn main() {} | ^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-63135.rs b/tests/ui/parser/issues/issue-63135.rs index d61197dc5..2e1ac080b 100644 --- a/tests/ui/parser/issues/issue-63135.rs +++ b/tests/ui/parser/issues/issue-63135.rs @@ -1,3 +1,3 @@ // error-pattern: this file contains an unclosed delimiter -// error-pattern: aborting due to previous error +// error-pattern: aborting due to 1 previous error fn i(n{...,f # diff --git a/tests/ui/parser/issues/issue-63135.stderr b/tests/ui/parser/issues/issue-63135.stderr index ff9d99c28..9204f561e 100644 --- a/tests/ui/parser/issues/issue-63135.stderr +++ b/tests/ui/parser/issues/issue-63135.stderr @@ -7,5 +7,5 @@ LL | fn i(n{...,f # | | unclosed delimiter | unclosed delimiter -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-65122-mac-invoc-in-mut-patterns.stderr b/tests/ui/parser/issues/issue-65122-mac-invoc-in-mut-patterns.stderr index 8c032e588..2bd87ee0c 100644 --- a/tests/ui/parser/issues/issue-65122-mac-invoc-in-mut-patterns.stderr +++ b/tests/ui/parser/issues/issue-65122-mac-invoc-in-mut-patterns.stderr @@ -2,7 +2,7 @@ error: `mut` must be followed by a named binding --> $DIR/issue-65122-mac-invoc-in-mut-patterns.rs:6:13 | LL | let mut $eval = (); - | ^^^^^^^^^ help: remove the `mut` prefix: `does_not_exist!()` + | ^^^^ help: remove the `mut` prefix ... LL | mac1! { does_not_exist!() } | --------------------------- in this macro invocation @@ -25,7 +25,7 @@ error: `mut` must be followed by a named binding --> $DIR/issue-65122-mac-invoc-in-mut-patterns.rs:13:13 | LL | let mut $eval = (); - | ^^^ help: remove the `mut` prefix: `does_not_exist!()` + | ^^^ help: remove the `mut` prefix ... LL | mac2! { does_not_exist!() } | --------------------------- in this macro invocation diff --git a/tests/ui/parser/issues/issue-6610.stderr b/tests/ui/parser/issues/issue-6610.stderr index 4a3bc7525..83fc02996 100644 --- a/tests/ui/parser/issues/issue-6610.stderr +++ b/tests/ui/parser/issues/issue-6610.stderr @@ -6,5 +6,5 @@ LL | trait Foo { fn a() } | | | while parsing this `fn` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-66357-unexpected-unreachable.stderr b/tests/ui/parser/issues/issue-66357-unexpected-unreachable.stderr index 079fff37e..a265cbf70 100644 --- a/tests/ui/parser/issues/issue-66357-unexpected-unreachable.stderr +++ b/tests/ui/parser/issues/issue-66357-unexpected-unreachable.stderr @@ -7,5 +7,5 @@ LL | fn f() { |[](* } | | unclosed delimiter | closing delimiter possibly meant for this -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-68091-unicode-ident-after-if.stderr b/tests/ui/parser/issues/issue-68091-unicode-ident-after-if.stderr index 6674b924e..2423a7526 100644 --- a/tests/ui/parser/issues/issue-68091-unicode-ident-after-if.stderr +++ b/tests/ui/parser/issues/issue-68091-unicode-ident-after-if.stderr @@ -6,5 +6,5 @@ LL | $($c)ö* {} | | | expected condition here -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-68092-unicode-ident-after-incomplete-expr.stderr b/tests/ui/parser/issues/issue-68092-unicode-ident-after-incomplete-expr.stderr index 0b9c364f1..43047ff88 100644 --- a/tests/ui/parser/issues/issue-68092-unicode-ident-after-incomplete-expr.stderr +++ b/tests/ui/parser/issues/issue-68092-unicode-ident-after-incomplete-expr.stderr @@ -4,5 +4,5 @@ error: macro expansion ends with an incomplete expression: expected expression LL | $($c)ö* | ^ expected expression -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-68890.stderr b/tests/ui/parser/issues/issue-68890.stderr index 0d7b53a67..43ed69dcf 100644 --- a/tests/ui/parser/issues/issue-68890.stderr +++ b/tests/ui/parser/issues/issue-68890.stderr @@ -8,7 +8,11 @@ error: expected one of `)`, `+`, or `,`, found `a` --> $DIR/issue-68890.rs:1:15 | LL | enum e{A((?'a a+?+l))} - | ^ expected one of `)`, `+`, or `,` + | - ^ expected one of `)`, `+`, or `,` + | | + | while parsing this enum + | + = help: enum variants can be `Variant`, `Variant = `, `Variant(Type, ..., TypeN)` or `Variant { fields: Types }` error: expected item, found `)` --> $DIR/issue-68890.rs:1:21 diff --git a/tests/ui/parser/issues/issue-68987-unmatch-issue-1.stderr b/tests/ui/parser/issues/issue-68987-unmatch-issue-1.stderr index 2d873b461..5b5d45a7e 100644 --- a/tests/ui/parser/issues/issue-68987-unmatch-issue-1.stderr +++ b/tests/ui/parser/issues/issue-68987-unmatch-issue-1.stderr @@ -12,5 +12,5 @@ LL | } LL | } | ^ unexpected closing delimiter -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-68987-unmatch-issue.stderr b/tests/ui/parser/issues/issue-68987-unmatch-issue.stderr index cabd13324..782b85f09 100644 --- a/tests/ui/parser/issues/issue-68987-unmatch-issue.stderr +++ b/tests/ui/parser/issues/issue-68987-unmatch-issue.stderr @@ -12,5 +12,5 @@ LL | } LL | } | ^ unexpected closing delimiter -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-69259.stderr b/tests/ui/parser/issues/issue-69259.stderr index 604b7de33..a8487b5f4 100644 --- a/tests/ui/parser/issues/issue-69259.stderr +++ b/tests/ui/parser/issues/issue-69259.stderr @@ -4,5 +4,5 @@ error: unexpected closing delimiter: `)` LL | fn f) {} | ^ unexpected closing delimiter -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-70552-ascription-in-parens-after-call.stderr b/tests/ui/parser/issues/issue-70552-ascription-in-parens-after-call.stderr index f03c92e1b..14cf52ce6 100644 --- a/tests/ui/parser/issues/issue-70552-ascription-in-parens-after-call.stderr +++ b/tests/ui/parser/issues/issue-70552-ascription-in-parens-after-call.stderr @@ -4,5 +4,5 @@ error: expected expression, found `:` LL | expr as fun()(:); | ^ expected expression -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-70583-block-is-empty-1.stderr b/tests/ui/parser/issues/issue-70583-block-is-empty-1.stderr index 46cbb056d..c4621b2b8 100644 --- a/tests/ui/parser/issues/issue-70583-block-is-empty-1.stderr +++ b/tests/ui/parser/issues/issue-70583-block-is-empty-1.stderr @@ -9,5 +9,5 @@ LL | } LL | } | ^ unexpected closing delimiter -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-70583-block-is-empty-2.stderr b/tests/ui/parser/issues/issue-70583-block-is-empty-2.stderr index c590e04bb..a21cd4875 100644 --- a/tests/ui/parser/issues/issue-70583-block-is-empty-2.stderr +++ b/tests/ui/parser/issues/issue-70583-block-is-empty-2.stderr @@ -12,5 +12,5 @@ LL | ErrorHandled::Reported => {}} LL | } | ^ unexpected closing delimiter -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-72253.stderr b/tests/ui/parser/issues/issue-72253.stderr index 477fa09f4..c4fc662f5 100644 --- a/tests/ui/parser/issues/issue-72253.stderr +++ b/tests/ui/parser/issues/issue-72253.stderr @@ -6,5 +6,5 @@ LL | .arg("1") LL | ,arg("2") | ^ unexpected token -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-72373.stderr b/tests/ui/parser/issues/issue-72373.stderr index 0bb99a01e..c596c6abd 100644 --- a/tests/ui/parser/issues/issue-72373.stderr +++ b/tests/ui/parser/issues/issue-72373.stderr @@ -9,5 +9,5 @@ help: if you meant to bind the contents of the rest of the array pattern into `t LL | [h, ref ts @ ..] => foo(c, n - h) + foo(ts, n), | + -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-76437-async.stderr b/tests/ui/parser/issues/issue-76437-async.stderr index 2c9c2a8cf..7f2df5c87 100644 --- a/tests/ui/parser/issues/issue-76437-async.stderr +++ b/tests/ui/parser/issues/issue-76437-async.stderr @@ -7,5 +7,5 @@ LL | async pub fn t() {} | | expected one of `extern`, `fn`, or `unsafe` | help: visibility `pub` must come before `async`: `pub async` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-76437-const-async-unsafe.stderr b/tests/ui/parser/issues/issue-76437-const-async-unsafe.stderr index 2e91beda1..a703fc4e8 100644 --- a/tests/ui/parser/issues/issue-76437-const-async-unsafe.stderr +++ b/tests/ui/parser/issues/issue-76437-const-async-unsafe.stderr @@ -7,5 +7,5 @@ LL | const async unsafe pub fn t() {} | | expected one of `extern` or `fn` | help: visibility `pub` must come before `const async unsafe`: `pub const async unsafe` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-76437-const-async.stderr b/tests/ui/parser/issues/issue-76437-const-async.stderr index 21b96c14d..a9acccdce 100644 --- a/tests/ui/parser/issues/issue-76437-const-async.stderr +++ b/tests/ui/parser/issues/issue-76437-const-async.stderr @@ -7,5 +7,5 @@ LL | const async pub fn t() {} | | expected one of `extern`, `fn`, or `unsafe` | help: visibility `pub` must come before `const async`: `pub const async` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-76437-const.stderr b/tests/ui/parser/issues/issue-76437-const.stderr index cf80d9a90..4c36d773d 100644 --- a/tests/ui/parser/issues/issue-76437-const.stderr +++ b/tests/ui/parser/issues/issue-76437-const.stderr @@ -7,5 +7,5 @@ LL | const pub fn t() {} | | expected one of `async`, `extern`, `fn`, or `unsafe` | help: visibility `pub` must come before `const`: `pub const` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-76437-pub-crate-unsafe.stderr b/tests/ui/parser/issues/issue-76437-pub-crate-unsafe.stderr index fa8f13721..4ea76179b 100644 --- a/tests/ui/parser/issues/issue-76437-pub-crate-unsafe.stderr +++ b/tests/ui/parser/issues/issue-76437-pub-crate-unsafe.stderr @@ -7,5 +7,5 @@ LL | unsafe pub(crate) fn t() {} | | expected one of `extern` or `fn` | help: visibility `pub(crate)` must come before `unsafe`: `pub(crate) unsafe` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-76437-unsafe.stderr b/tests/ui/parser/issues/issue-76437-unsafe.stderr index c63292ef8..69f792775 100644 --- a/tests/ui/parser/issues/issue-76437-unsafe.stderr +++ b/tests/ui/parser/issues/issue-76437-unsafe.stderr @@ -7,5 +7,5 @@ LL | unsafe pub fn t() {} | | expected one of `extern` or `fn` | help: visibility `pub` must come before `unsafe`: `pub unsafe` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-76597.stderr b/tests/ui/parser/issues/issue-76597.stderr index 50b23329f..25858981c 100644 --- a/tests/ui/parser/issues/issue-76597.stderr +++ b/tests/ui/parser/issues/issue-76597.stderr @@ -9,5 +9,5 @@ LL | ... x: u8 LL | ... y: u8, | ^ unexpected token -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-7970b.stderr b/tests/ui/parser/issues/issue-7970b.stderr index a62226a8a..b23b09e75 100644 --- a/tests/ui/parser/issues/issue-7970b.stderr +++ b/tests/ui/parser/issues/issue-7970b.stderr @@ -4,5 +4,5 @@ error: unexpected end of macro invocation LL | macro_rules! test {} | ^^^^^^^^^^^^^^^^^^^^ missing tokens in macro arguments -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-81806.stderr b/tests/ui/parser/issues/issue-81806.stderr index 40873388d..f1287b82f 100644 --- a/tests/ui/parser/issues/issue-81806.stderr +++ b/tests/ui/parser/issues/issue-81806.stderr @@ -13,5 +13,5 @@ help: escape `impl` to use it as an identifier LL | r#impl | ++ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-83639.stderr b/tests/ui/parser/issues/issue-83639.stderr index 4c10df191..87218a448 100644 --- a/tests/ui/parser/issues/issue-83639.stderr +++ b/tests/ui/parser/issues/issue-83639.stderr @@ -4,5 +4,5 @@ error: expected one of `.`, `;`, `?`, `}`, or an operator, found `" "` LL | """ " | ^^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-84104.stderr b/tests/ui/parser/issues/issue-84104.stderr index 7ad59f845..e866d3922 100644 --- a/tests/ui/parser/issues/issue-84104.stderr +++ b/tests/ui/parser/issues/issue-84104.stderr @@ -6,5 +6,5 @@ LL | #[i=i::<ښܖ< | | | unclosed delimiter -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-84148-2.stderr b/tests/ui/parser/issues/issue-84148-2.stderr index 20761180e..d9b6b336a 100644 --- a/tests/ui/parser/issues/issue-84148-2.stderr +++ b/tests/ui/parser/issues/issue-84148-2.stderr @@ -6,5 +6,5 @@ LL | fn f(t:for<>t? | | | unclosed delimiter -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-8537.stderr b/tests/ui/parser/issues/issue-8537.stderr index 523cc9dc5..0d636bd28 100644 --- a/tests/ui/parser/issues/issue-8537.stderr +++ b/tests/ui/parser/issues/issue-8537.stderr @@ -6,6 +6,6 @@ LL | "invalid-ab_isize" | = note: invoke `rustc --print=calling-conventions` for a full list of supported calling conventions. -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0703`. diff --git a/tests/ui/parser/issues/issue-86895.stderr b/tests/ui/parser/issues/issue-86895.stderr index 575d857c0..dcde7242d 100644 --- a/tests/ui/parser/issues/issue-86895.stderr +++ b/tests/ui/parser/issues/issue-86895.stderr @@ -4,5 +4,5 @@ error: expected one of `async`, `extern`, `fn`, or `unsafe`, found keyword `pub` LL | const pub () {} | ^^^ expected one of `async`, `extern`, `fn`, or `unsafe` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-87217-keyword-order/wrong-async.stderr b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-async.stderr index e9eb14bf0..74989502e 100644 --- a/tests/ui/parser/issues/issue-87217-keyword-order/wrong-async.stderr +++ b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-async.stderr @@ -9,5 +9,5 @@ LL | unsafe async fn test() {} | = note: keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-87217-keyword-order/wrong-const.stderr b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-const.stderr index 0d2bc3472..5958f0c7d 100644 --- a/tests/ui/parser/issues/issue-87217-keyword-order/wrong-const.stderr +++ b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-const.stderr @@ -9,5 +9,5 @@ LL | unsafe const fn test() {} | = note: keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.stderr b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.stderr index 4224713cc..0e9f7c51e 100644 --- a/tests/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.stderr +++ b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.stderr @@ -9,5 +9,5 @@ LL | extern unsafe fn test() {} | = note: keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-87694-duplicated-pub.stderr b/tests/ui/parser/issues/issue-87694-duplicated-pub.stderr index 8d242bc9d..a21023865 100644 --- a/tests/ui/parser/issues/issue-87694-duplicated-pub.stderr +++ b/tests/ui/parser/issues/issue-87694-duplicated-pub.stderr @@ -13,5 +13,5 @@ note: explicit visibility first seen here LL | pub const pub fn test() {} | ^^^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-87694-misplaced-pub.stderr b/tests/ui/parser/issues/issue-87694-misplaced-pub.stderr index 94c6a29ef..6f686a7e5 100644 --- a/tests/ui/parser/issues/issue-87694-misplaced-pub.stderr +++ b/tests/ui/parser/issues/issue-87694-misplaced-pub.stderr @@ -7,5 +7,5 @@ LL | const pub fn test() {} | | expected one of `async`, `extern`, `fn`, or `unsafe` | help: visibility `pub` must come before `const`: `pub const` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-87812-path.stderr b/tests/ui/parser/issues/issue-87812-path.stderr index d045f4821..fbe26ea39 100644 --- a/tests/ui/parser/issues/issue-87812-path.stderr +++ b/tests/ui/parser/issues/issue-87812-path.stderr @@ -11,6 +11,6 @@ LL | foo!(Baz); | = note: this error originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info) -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0308`. diff --git a/tests/ui/parser/issues/issue-87812.stderr b/tests/ui/parser/issues/issue-87812.stderr index d61ee23a5..35dc66a52 100644 --- a/tests/ui/parser/issues/issue-87812.stderr +++ b/tests/ui/parser/issues/issue-87812.stderr @@ -18,5 +18,5 @@ help: wrap this expression in parentheses LL | break '_l ($f); | + + -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-88770.stderr b/tests/ui/parser/issues/issue-88770.stderr index 836f44953..60ef025fa 100644 --- a/tests/ui/parser/issues/issue-88770.stderr +++ b/tests/ui/parser/issues/issue-88770.stderr @@ -10,5 +10,5 @@ LL | fn m(){print!("",(c for&g LL | e | ^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-88818.stderr b/tests/ui/parser/issues/issue-88818.stderr index 6e624c5a2..10e016106 100644 --- a/tests/ui/parser/issues/issue-88818.stderr +++ b/tests/ui/parser/issues/issue-88818.stderr @@ -14,5 +14,5 @@ LL - impl for S { } LL + impl S { } | -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-89388.stderr b/tests/ui/parser/issues/issue-89388.stderr index 366d05c2d..d4987234a 100644 --- a/tests/ui/parser/issues/issue-89388.stderr +++ b/tests/ui/parser/issues/issue-89388.stderr @@ -9,5 +9,5 @@ help: types that don't start with an identifier need to be surrounded with angle LL | let _ = option.map(<[_]>::to_vec); | + + -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-89574.stderr b/tests/ui/parser/issues/issue-89574.stderr index fb1312c78..5f8f6f939 100644 --- a/tests/ui/parser/issues/issue-89574.stderr +++ b/tests/ui/parser/issues/issue-89574.stderr @@ -4,5 +4,5 @@ error: missing type for `const` item LL | const EMPTY_ARRAY = []; | ^ help: provide a type for the item: `: ` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.stderr b/tests/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.stderr index a5ee24445..51df17c7c 100644 --- a/tests/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.stderr +++ b/tests/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.stderr @@ -14,5 +14,5 @@ LL - #![deny(missing_docs)] LL + #[deny(missing_docs)] | -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-91421.stderr b/tests/ui/parser/issues/issue-91421.stderr index 2d9652051..99339a285 100644 --- a/tests/ui/parser/issues/issue-91421.stderr +++ b/tests/ui/parser/issues/issue-91421.stderr @@ -10,5 +10,5 @@ help: this binary operation is possibly unfinished LL | let value = if true && { | ^^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-93867.stderr b/tests/ui/parser/issues/issue-93867.stderr index ee0cb4efd..c653c8dd4 100644 --- a/tests/ui/parser/issues/issue-93867.stderr +++ b/tests/ui/parser/issues/issue-93867.stderr @@ -9,5 +9,5 @@ help: you might have meant to end the type parameters here LL | pub fn entry<'a, K, V>() -> Entry<'a> K, V> { | + -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-98601-delimiter-error-1.stderr b/tests/ui/parser/issues/issue-98601-delimiter-error-1.stderr index d568a4c58..7dd059c6e 100644 --- a/tests/ui/parser/issues/issue-98601-delimiter-error-1.stderr +++ b/tests/ui/parser/issues/issue-98601-delimiter-error-1.stderr @@ -12,5 +12,5 @@ LL | } LL | } | ^ unexpected closing delimiter -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-98601-delimiter-error-unexpected-close.stderr b/tests/ui/parser/issues/issue-98601-delimiter-error-unexpected-close.stderr index 81dd39bb7..5e4b4dd30 100644 --- a/tests/ui/parser/issues/issue-98601-delimiter-error-unexpected-close.stderr +++ b/tests/ui/parser/issues/issue-98601-delimiter-error-unexpected-close.stderr @@ -10,5 +10,5 @@ LL | LL | fn other(_: i32)) {} | ^ unexpected closing delimiter -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/issue-99625-enum-struct-mutually-exclusive.stderr b/tests/ui/parser/issues/issue-99625-enum-struct-mutually-exclusive.stderr index edc640bf5..c503bc3cc 100644 --- a/tests/ui/parser/issues/issue-99625-enum-struct-mutually-exclusive.stderr +++ b/tests/ui/parser/issues/issue-99625-enum-struct-mutually-exclusive.stderr @@ -4,5 +4,5 @@ error: `enum` and `struct` are mutually exclusive LL | pub enum struct Range { | ^^^^^^^^^^^ help: replace `enum struct` with: `enum` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/parser/issues/recover-ge-as-fat-arrow.fixed b/tests/ui/parser/issues/recover-ge-as-fat-arrow.fixed new file mode 100644 index 000000000..7b73dfb02 --- /dev/null +++ b/tests/ui/parser/issues/recover-ge-as-fat-arrow.fixed @@ -0,0 +1,7 @@ +// run-rustfix +fn main() { + match 1 { + 1 => {} //~ ERROR + _ => { let _: u16 = 2u16; } //~ ERROR + } +} diff --git a/tests/ui/parser/issues/recover-ge-as-fat-arrow.rs b/tests/ui/parser/issues/recover-ge-as-fat-arrow.rs new file mode 100644 index 000000000..92143fcf3 --- /dev/null +++ b/tests/ui/parser/issues/recover-ge-as-fat-arrow.rs @@ -0,0 +1,7 @@ +// run-rustfix +fn main() { + match 1 { + 1 >= {} //~ ERROR + _ => { let _: u16 = 2u8; } //~ ERROR + } +} diff --git a/tests/ui/parser/issues/recover-ge-as-fat-arrow.stderr b/tests/ui/parser/issues/recover-ge-as-fat-arrow.stderr new file mode 100644 index 000000000..2df5cca24 --- /dev/null +++ b/tests/ui/parser/issues/recover-ge-as-fat-arrow.stderr @@ -0,0 +1,25 @@ +error: expected one of `...`, `..=`, `..`, `=>`, `if`, or `|`, found `>=` + --> $DIR/recover-ge-as-fat-arrow.rs:4:11 + | +LL | 1 >= {} + | ^^ + | | + | expected one of `...`, `..=`, `..`, `=>`, `if`, or `|` + | help: use a fat arrow to start a match arm: `=>` + +error[E0308]: mismatched types + --> $DIR/recover-ge-as-fat-arrow.rs:5:29 + | +LL | _ => { let _: u16 = 2u8; } + | --- ^^^ expected `u16`, found `u8` + | | + | expected due to this + | +help: change the type of the numeric literal from `u8` to `u16` + | +LL | _ => { let _: u16 = 2u16; } + | ~~~ + +error: aborting due to 2 previous errors + +For more information about this error, try `rustc --explain E0308`. -- cgit v1.2.3