From 9c6bbf125277cf8e9b8374bfbf95f2bc12456f23 Mon Sep 17 00:00:00 2001 From: Mazdak Farrokhzad Date: Sat, 7 Dec 2019 00:59:56 +0100 Subject: extract error_unexpected_after_dot and de-fatalize --- src/test/ui/parser/attr-stmt-expr-attr-bad-2.rs | 2 -- .../ui/parser/attr-stmt-expr-attr-bad-2.stderr | 8 ------- src/test/ui/parser/attr-stmt-expr-attr-bad-3.rs | 2 -- .../ui/parser/attr-stmt-expr-attr-bad-3.stderr | 8 ------- src/test/ui/parser/attr-stmt-expr-attr-bad.rs | 7 ++++++ src/test/ui/parser/attr-stmt-expr-attr-bad.stderr | 28 ++++++++++++++++++++-- 6 files changed, 33 insertions(+), 22 deletions(-) delete mode 100644 src/test/ui/parser/attr-stmt-expr-attr-bad-2.rs delete mode 100644 src/test/ui/parser/attr-stmt-expr-attr-bad-2.stderr delete mode 100644 src/test/ui/parser/attr-stmt-expr-attr-bad-3.rs delete mode 100644 src/test/ui/parser/attr-stmt-expr-attr-bad-3.stderr (limited to 'src/test/ui/parser') diff --git a/src/test/ui/parser/attr-stmt-expr-attr-bad-2.rs b/src/test/ui/parser/attr-stmt-expr-attr-bad-2.rs deleted file mode 100644 index e5ac59ae463..00000000000 --- a/src/test/ui/parser/attr-stmt-expr-attr-bad-2.rs +++ /dev/null @@ -1,2 +0,0 @@ -#[cfg(FALSE)] fn e() { let _ = x.#![attr]foo(); } -//~^ ERROR unexpected token: `#` diff --git a/src/test/ui/parser/attr-stmt-expr-attr-bad-2.stderr b/src/test/ui/parser/attr-stmt-expr-attr-bad-2.stderr deleted file mode 100644 index ca1043250ba..00000000000 --- a/src/test/ui/parser/attr-stmt-expr-attr-bad-2.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: unexpected token: `#` - --> $DIR/attr-stmt-expr-attr-bad-2.rs:1:34 - | -LL | #[cfg(FALSE)] fn e() { let _ = x.#![attr]foo(); } - | ^ - -error: aborting due to previous error - diff --git a/src/test/ui/parser/attr-stmt-expr-attr-bad-3.rs b/src/test/ui/parser/attr-stmt-expr-attr-bad-3.rs deleted file mode 100644 index 7dc71af52f4..00000000000 --- a/src/test/ui/parser/attr-stmt-expr-attr-bad-3.rs +++ /dev/null @@ -1,2 +0,0 @@ -#[cfg(FALSE)] fn e() { let _ = x.#[attr]foo(); } -//~^ ERROR unexpected token: `#` diff --git a/src/test/ui/parser/attr-stmt-expr-attr-bad-3.stderr b/src/test/ui/parser/attr-stmt-expr-attr-bad-3.stderr deleted file mode 100644 index ab9366d042a..00000000000 --- a/src/test/ui/parser/attr-stmt-expr-attr-bad-3.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: unexpected token: `#` - --> $DIR/attr-stmt-expr-attr-bad-3.rs:1:34 - | -LL | #[cfg(FALSE)] fn e() { let _ = x.#[attr]foo(); } - | ^ - -error: aborting due to previous error - diff --git a/src/test/ui/parser/attr-stmt-expr-attr-bad.rs b/src/test/ui/parser/attr-stmt-expr-attr-bad.rs index ef10010ed0e..6e1d72cd2f6 100644 --- a/src/test/ui/parser/attr-stmt-expr-attr-bad.rs +++ b/src/test/ui/parser/attr-stmt-expr-attr-bad.rs @@ -101,6 +101,13 @@ fn main() {} //~^ ERROR `X..=` range patterns are not supported //~| ERROR expected one of `=>`, `if`, or `|`, found `#` +#[cfg(FALSE)] fn e() { let _ = x.#![attr]foo(); } +//~^ ERROR unexpected token: `#` +//~| ERROR expected one of `.` +#[cfg(FALSE)] fn e() { let _ = x.#[attr]foo(); } +//~^ ERROR unexpected token: `#` +//~| ERROR expected one of `.` + // make sure we don't catch this bug again... #[cfg(FALSE)] fn e() { { fn foo() { #[attr]; } } } //~^ ERROR expected statement after outer attribute diff --git a/src/test/ui/parser/attr-stmt-expr-attr-bad.stderr b/src/test/ui/parser/attr-stmt-expr-attr-bad.stderr index 30aa820141c..992b491917e 100644 --- a/src/test/ui/parser/attr-stmt-expr-attr-bad.stderr +++ b/src/test/ui/parser/attr-stmt-expr-attr-bad.stderr @@ -380,11 +380,35 @@ error: expected one of `=>`, `if`, or `|`, found `#` LL | #[cfg(FALSE)] fn e() { match 0 { 0..=#[attr] FOO => () } } | ^ expected one of `=>`, `if`, or `|` +error: unexpected token: `#` + --> $DIR/attr-stmt-expr-attr-bad.rs:104:34 + | +LL | #[cfg(FALSE)] fn e() { let _ = x.#![attr]foo(); } + | ^ + +error: expected one of `.`, `;`, `?`, or an operator, found `#` + --> $DIR/attr-stmt-expr-attr-bad.rs:104:34 + | +LL | #[cfg(FALSE)] fn e() { let _ = x.#![attr]foo(); } + | ^ expected one of `.`, `;`, `?`, or an operator + +error: unexpected token: `#` + --> $DIR/attr-stmt-expr-attr-bad.rs:106:34 + | +LL | #[cfg(FALSE)] fn e() { let _ = x.#[attr]foo(); } + | ^ + +error: expected one of `.`, `;`, `?`, or an operator, found `#` + --> $DIR/attr-stmt-expr-attr-bad.rs:106:34 + | +LL | #[cfg(FALSE)] fn e() { let _ = x.#[attr]foo(); } + | ^ expected one of `.`, `;`, `?`, or an operator + error: expected statement after outer attribute - --> $DIR/attr-stmt-expr-attr-bad.rs:105:44 + --> $DIR/attr-stmt-expr-attr-bad.rs:110:44 | LL | #[cfg(FALSE)] fn e() { { fn foo() { #[attr]; } } } | ^ -error: aborting due to 52 previous errors +error: aborting due to 56 previous errors -- cgit 1.4.1-3-g733a5