diff options
| author | bors <bors@rust-lang.org> | 2018-11-08 09:38:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-11-08 09:38:49 +0000 |
| commit | 653da4fd006c97625247acd7e076d0782cdc149b (patch) | |
| tree | acfa346812a2cf2bd37fb0d67a0630939745ca78 /src/test/ui/missing | |
| parent | 1d834550d54e4c5211f03f877c1756425f24be98 (diff) | |
| parent | f4da71e04e1929d91a84855940c04d69d6166ce3 (diff) | |
| download | rust-653da4fd006c97625247acd7e076d0782cdc149b.tar.gz rust-653da4fd006c97625247acd7e076d0782cdc149b.zip | |
Auto merge of #55532 - pnkfelix:rustc_error-survey, r=nikomatsakis
#[rustc_error] survey Fix #55505
Diffstat (limited to 'src/test/ui/missing')
| -rw-r--r-- | src/test/ui/missing/missing-semicolon-warning.rs | 6 | ||||
| -rw-r--r-- | src/test/ui/missing/missing-semicolon-warning.stderr | 12 |
2 files changed, 5 insertions, 13 deletions
diff --git a/src/test/ui/missing/missing-semicolon-warning.rs b/src/test/ui/missing/missing-semicolon-warning.rs index bbc958b87a5..219f68877be 100644 --- a/src/test/ui/missing/missing-semicolon-warning.rs +++ b/src/test/ui/missing/missing-semicolon-warning.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(rustc_attrs)] +// compile-pass #![allow(unused)] macro_rules! m { @@ -18,5 +18,5 @@ macro_rules! m { } } -#[rustc_error] -fn main() { m!(0, 0; 0, 0); } //~ ERROR compilation successful + +fn main() { m!(0, 0; 0, 0); } diff --git a/src/test/ui/missing/missing-semicolon-warning.stderr b/src/test/ui/missing/missing-semicolon-warning.stderr index b4427565a86..c294e3eaf9c 100644 --- a/src/test/ui/missing/missing-semicolon-warning.stderr +++ b/src/test/ui/missing/missing-semicolon-warning.stderr @@ -4,7 +4,7 @@ warning: expected `;`, found keyword `let` LL | $( let x = $e1 )*; //~ WARN expected `;` | ^^^ ... -LL | fn main() { m!(0, 0; 0, 0); } //~ ERROR compilation successful +LL | fn main() { m!(0, 0; 0, 0); } | --------------- in this macro invocation | = note: This was erroneously allowed and will become a hard error in a future release @@ -15,16 +15,8 @@ warning: expected `;`, found `println` LL | $( println!("{}", $e2) )*; //~ WARN expected `;` | ^^^^^^^ ... -LL | fn main() { m!(0, 0; 0, 0); } //~ ERROR compilation successful +LL | fn main() { m!(0, 0; 0, 0); } | --------------- in this macro invocation | = note: This was erroneously allowed and will become a hard error in a future release -error: compilation successful - --> $DIR/missing-semicolon-warning.rs:22:1 - | -LL | fn main() { m!(0, 0; 0, 0); } //~ ERROR compilation successful - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -error: aborting due to previous error - |