diff options
Diffstat (limited to 'src/test/ui/macros')
7 files changed, 28 insertions, 25 deletions
diff --git a/src/test/ui/macros/macro-at-most-once-rep-2018-feature-gate.stderr b/src/test/ui/macros/macro-at-most-once-rep-2018-feature-gate.stderr index 7705ba3b11e..27dc03e1c39 100644 --- a/src/test/ui/macros/macro-at-most-once-rep-2018-feature-gate.stderr +++ b/src/test/ui/macros/macro-at-most-once-rep-2018-feature-gate.stderr @@ -55,7 +55,7 @@ LL | macro_rules! foo { | ---------------- when calling this macro ... LL | foo!(a?); //~ ERROR no rules expected the token `?` - | ^ no rules expected the token `?` + | ^ no rules expected this token in macro call error: no rules expected the token `?` --> $DIR/macro-at-most-once-rep-2018-feature-gate.rs:42:11 @@ -64,7 +64,7 @@ LL | macro_rules! foo { | ---------------- when calling this macro ... LL | foo!(a?a); //~ ERROR no rules expected the token `?` - | ^ no rules expected the token `?` + | ^ no rules expected this token in macro call error: no rules expected the token `?` --> $DIR/macro-at-most-once-rep-2018-feature-gate.rs:43:11 @@ -73,7 +73,7 @@ LL | macro_rules! foo { | ---------------- when calling this macro ... LL | foo!(a?a?a); //~ ERROR no rules expected the token `?` - | ^ no rules expected the token `?` + | ^ no rules expected this token in macro call error: aborting due to 10 previous errors diff --git a/src/test/ui/macros/macro-at-most-once-rep-2018.stderr b/src/test/ui/macros/macro-at-most-once-rep-2018.stderr index 25dd66b81f5..d363b672680 100644 --- a/src/test/ui/macros/macro-at-most-once-rep-2018.stderr +++ b/src/test/ui/macros/macro-at-most-once-rep-2018.stderr @@ -11,7 +11,7 @@ LL | macro_rules! foo { | ---------------- when calling this macro ... LL | foo!(a?); //~ ERROR no rules expected the token `?` - | ^ no rules expected the token `?` + | ^ no rules expected this token in macro call error: no rules expected the token `?` --> $DIR/macro-at-most-once-rep-2018.rs:37:11 @@ -20,7 +20,7 @@ LL | macro_rules! foo { | ---------------- when calling this macro ... LL | foo!(a?a); //~ ERROR no rules expected the token `?` - | ^ no rules expected the token `?` + | ^ no rules expected this token in macro call error: no rules expected the token `?` --> $DIR/macro-at-most-once-rep-2018.rs:38:11 @@ -29,7 +29,7 @@ LL | macro_rules! foo { | ---------------- when calling this macro ... LL | foo!(a?a?a); //~ ERROR no rules expected the token `?` - | ^ no rules expected the token `?` + | ^ no rules expected this token in macro call error: unexpected end of macro invocation --> $DIR/macro-at-most-once-rep-2018.rs:40:5 @@ -38,16 +38,16 @@ LL | macro_rules! barplus { | -------------------- when calling this macro ... LL | barplus!(); //~ERROR unexpected end of macro invocation - | ^^^^^^^^^^^ unexpected end of macro invocation + | ^^^^^^^^^^^ missing tokens in macro arguments error: unexpected end of macro invocation - --> $DIR/macro-at-most-once-rep-2018.rs:41:14 + --> $DIR/macro-at-most-once-rep-2018.rs:41:15 | LL | macro_rules! barplus { | -------------------- when calling this macro ... LL | barplus!(a); //~ERROR unexpected end of macro invocation - | ^ unexpected end of macro invocation + | ^ missing tokens in macro arguments error: no rules expected the token `?` --> $DIR/macro-at-most-once-rep-2018.rs:42:15 @@ -56,7 +56,7 @@ LL | macro_rules! barplus { | -------------------- when calling this macro ... LL | barplus!(a?); //~ ERROR no rules expected the token `?` - | ^ no rules expected the token `?` + | ^ no rules expected this token in macro call error: no rules expected the token `?` --> $DIR/macro-at-most-once-rep-2018.rs:43:15 @@ -65,7 +65,7 @@ LL | macro_rules! barplus { | -------------------- when calling this macro ... LL | barplus!(a?a); //~ ERROR no rules expected the token `?` - | ^ no rules expected the token `?` + | ^ no rules expected this token in macro call error: unexpected end of macro invocation --> $DIR/macro-at-most-once-rep-2018.rs:47:5 @@ -74,16 +74,16 @@ LL | macro_rules! barstar { | -------------------- when calling this macro ... LL | barstar!(); //~ERROR unexpected end of macro invocation - | ^^^^^^^^^^^ unexpected end of macro invocation + | ^^^^^^^^^^^ missing tokens in macro arguments error: unexpected end of macro invocation - --> $DIR/macro-at-most-once-rep-2018.rs:48:14 + --> $DIR/macro-at-most-once-rep-2018.rs:48:15 | LL | macro_rules! barstar { | -------------------- when calling this macro ... LL | barstar!(a); //~ERROR unexpected end of macro invocation - | ^ unexpected end of macro invocation + | ^ missing tokens in macro arguments error: no rules expected the token `?` --> $DIR/macro-at-most-once-rep-2018.rs:49:15 @@ -92,7 +92,7 @@ LL | macro_rules! barstar { | -------------------- when calling this macro ... LL | barstar!(a?); //~ ERROR no rules expected the token `?` - | ^ no rules expected the token `?` + | ^ no rules expected this token in macro call error: no rules expected the token `?` --> $DIR/macro-at-most-once-rep-2018.rs:50:15 @@ -101,7 +101,7 @@ LL | macro_rules! barstar { | -------------------- when calling this macro ... LL | barstar!(a?a); //~ ERROR no rules expected the token `?` - | ^ no rules expected the token `?` + | ^ no rules expected this token in macro call error: aborting due to 12 previous errors diff --git a/src/test/ui/macros/macro-in-expression-context-2.stderr b/src/test/ui/macros/macro-in-expression-context-2.stderr index 80d5dbd66cc..672871c49ca 100644 --- a/src/test/ui/macros/macro-in-expression-context-2.stderr +++ b/src/test/ui/macros/macro-in-expression-context-2.stderr @@ -1,8 +1,11 @@ -error: expected expression, found `<eof>` +error: macro expansion ends with an incomplete expression: expected expression --> $DIR/macro-in-expression-context-2.rs:5:16 | +LL | macro_rules! empty { () => () } + | -- in this macro arm +... LL | _ => { empty!() } - | ^^^^^^^^ + | ^^^^^^^^ expected expression error: aborting due to previous error diff --git a/src/test/ui/macros/macro-non-lifetime.stderr b/src/test/ui/macros/macro-non-lifetime.stderr index d526023d441..df9db06ca19 100644 --- a/src/test/ui/macros/macro-non-lifetime.stderr +++ b/src/test/ui/macros/macro-non-lifetime.stderr @@ -5,7 +5,7 @@ LL | macro_rules! m { ($x:lifetime) => { } } | -------------- when calling this macro ... LL | m!(a); - | ^ no rules expected the token `a` + | ^ no rules expected this token in macro call error: aborting due to previous error diff --git a/src/test/ui/macros/missing-comma.stderr b/src/test/ui/macros/missing-comma.stderr index 1d6af44bd08..886e15c4412 100644 --- a/src/test/ui/macros/missing-comma.stderr +++ b/src/test/ui/macros/missing-comma.stderr @@ -11,7 +11,7 @@ LL | macro_rules! foo { | ---------------- when calling this macro ... LL | foo!(a b); - | -^ no rules expected the token `b` + | -^ no rules expected this token in macro call | | | help: missing comma here @@ -22,7 +22,7 @@ LL | macro_rules! foo { | ---------------- when calling this macro ... LL | foo!(a, b, c, d e); - | -^ no rules expected the token `e` + | -^ no rules expected this token in macro call | | | help: missing comma here @@ -33,7 +33,7 @@ LL | macro_rules! foo { | ---------------- when calling this macro ... LL | foo!(a, b, c d, e); - | -^ no rules expected the token `d` + | -^ no rules expected this token in macro call | | | help: missing comma here @@ -44,7 +44,7 @@ LL | macro_rules! foo { | ---------------- when calling this macro ... LL | foo!(a, b, c d e); - | ^ no rules expected the token `d` + | ^ no rules expected this token in macro call error: aborting due to 5 previous errors diff --git a/src/test/ui/macros/nonterminal-matching.stderr b/src/test/ui/macros/nonterminal-matching.stderr index 23853978d37..9dfa53dab55 100644 --- a/src/test/ui/macros/nonterminal-matching.stderr +++ b/src/test/ui/macros/nonterminal-matching.stderr @@ -2,7 +2,7 @@ error: no rules expected the token `enum E { }` --> $DIR/nonterminal-matching.rs:29:10 | LL | n!(a $nt_item b); //~ ERROR no rules expected the token `enum E { }` - | ^^^^^^^^ no rules expected the token `enum E { }` + | ^^^^^^^^ no rules expected this token in macro call ... LL | complex_nonterminal!(enum E {}); | -------------------------------- in this macro invocation diff --git a/src/test/ui/macros/trace_faulty_macros.stderr b/src/test/ui/macros/trace_faulty_macros.stderr index 853eb5847c0..f524ebb3216 100644 --- a/src/test/ui/macros/trace_faulty_macros.stderr +++ b/src/test/ui/macros/trace_faulty_macros.stderr @@ -5,7 +5,7 @@ LL | macro_rules! my_faulty_macro { | ---------------------------- when calling this macro LL | () => { LL | my_faulty_macro!(bcd); //~ ERROR no rules - | ^^^ no rules expected the token `bcd` + | ^^^ no rules expected this token in macro call ... LL | my_faulty_macro!(); | ------------------- in this macro invocation |