diff options
| author | Esteban Küber <esteban@kuber.com.ar> | 2018-11-04 14:01:38 -0800 |
|---|---|---|
| committer | Esteban Küber <esteban@kuber.com.ar> | 2018-11-23 15:37:31 -0800 |
| commit | e5cd1edfa190442f4e3e0f53c0ac28f6cc9d15f3 (patch) | |
| tree | ba1bc1bede440d2aa8e121fdcc03486d68550db0 /src/test | |
| parent | 34bd86a3fd69a49177cce88b34e16fbfdf8e0304 (diff) | |
| download | rust-e5cd1edfa190442f4e3e0f53c0ac28f6cc9d15f3.tar.gz rust-e5cd1edfa190442f4e3e0f53c0ac28f6cc9d15f3.zip | |
Reword incorrect macro invocation primary label
Diffstat (limited to 'src/test')
18 files changed, 37 insertions, 37 deletions
diff --git a/src/test/ui/editions/edition-keywords-2015-2015-parsing.stderr b/src/test/ui/editions/edition-keywords-2015-2015-parsing.stderr index e8f05cbb0ef..8bf8c3c3560 100644 --- a/src/test/ui/editions/edition-keywords-2015-2015-parsing.stderr +++ b/src/test/ui/editions/edition-keywords-2015-2015-parsing.stderr @@ -2,13 +2,13 @@ error: no rules expected the token `r#async` --> $DIR/edition-keywords-2015-2015-parsing.rs:22:31 | LL | r#async = consumes_async!(r#async); //~ ERROR no rules expected the token `r#async` - | ^^^^^^^ no rules expected the token `r#async` + | ^^^^^^^ no rules expected this token in macro call error: no rules expected the token `async` --> $DIR/edition-keywords-2015-2015-parsing.rs:23:35 | LL | r#async = consumes_async_raw!(async); //~ ERROR no rules expected the token `async` - | ^^^^^ no rules expected the token `async` + | ^^^^^ no rules expected this token in macro call error: aborting due to 2 previous errors diff --git a/src/test/ui/editions/edition-keywords-2015-2018-parsing.stderr b/src/test/ui/editions/edition-keywords-2015-2018-parsing.stderr index 3f5e1137383..77622548bce 100644 --- a/src/test/ui/editions/edition-keywords-2015-2018-parsing.stderr +++ b/src/test/ui/editions/edition-keywords-2015-2018-parsing.stderr @@ -2,13 +2,13 @@ error: no rules expected the token `r#async` --> $DIR/edition-keywords-2015-2018-parsing.rs:22:31 | LL | r#async = consumes_async!(r#async); //~ ERROR no rules expected the token `r#async` - | ^^^^^^^ no rules expected the token `r#async` + | ^^^^^^^ no rules expected this token in macro call error: no rules expected the token `async` --> $DIR/edition-keywords-2015-2018-parsing.rs:23:35 | LL | r#async = consumes_async_raw!(async); //~ ERROR no rules expected the token `async` - | ^^^^^ no rules expected the token `async` + | ^^^^^ no rules expected this token in macro call error: aborting due to 2 previous errors diff --git a/src/test/ui/editions/edition-keywords-2018-2015-parsing.stderr b/src/test/ui/editions/edition-keywords-2018-2015-parsing.stderr index bf7fc28c758..ad5794c75d3 100644 --- a/src/test/ui/editions/edition-keywords-2018-2015-parsing.stderr +++ b/src/test/ui/editions/edition-keywords-2018-2015-parsing.stderr @@ -14,13 +14,13 @@ error: no rules expected the token `r#async` --> $DIR/edition-keywords-2018-2015-parsing.rs:22:31 | LL | r#async = consumes_async!(r#async); //~ ERROR no rules expected the token `r#async` - | ^^^^^^^ no rules expected the token `r#async` + | ^^^^^^^ no rules expected this token in macro call error: no rules expected the token `async` --> $DIR/edition-keywords-2018-2015-parsing.rs:23:35 | LL | r#async = consumes_async_raw!(async); //~ ERROR no rules expected the token `async` - | ^^^^^ no rules expected the token `async` + | ^^^^^ no rules expected this token in macro call error: expected one of `move`, `|`, or `||`, found the end of the macro arm --> <::edition_kw_macro_2015::passes_ident macros>:1:25 diff --git a/src/test/ui/editions/edition-keywords-2018-2018-parsing.stderr b/src/test/ui/editions/edition-keywords-2018-2018-parsing.stderr index 4ab29ba67a0..c86817d482b 100644 --- a/src/test/ui/editions/edition-keywords-2018-2018-parsing.stderr +++ b/src/test/ui/editions/edition-keywords-2018-2018-parsing.stderr @@ -14,13 +14,13 @@ error: no rules expected the token `r#async` --> $DIR/edition-keywords-2018-2018-parsing.rs:22:31 | LL | r#async = consumes_async!(r#async); //~ ERROR no rules expected the token `r#async` - | ^^^^^^^ no rules expected the token `r#async` + | ^^^^^^^ no rules expected this token in macro call error: no rules expected the token `async` --> $DIR/edition-keywords-2018-2018-parsing.rs:23:35 | LL | r#async = consumes_async_raw!(async); //~ ERROR no rules expected the token `async` - | ^^^^^ no rules expected the token `async` + | ^^^^^ no rules expected this token in macro call error: expected one of `move`, `|`, or `||`, found the end of the macro arm --> <::edition_kw_macro_2018::passes_ident macros>:1:25 diff --git a/src/test/ui/empty/empty-comment.stderr b/src/test/ui/empty/empty-comment.stderr index de826102081..d1b031c1f6c 100644 --- a/src/test/ui/empty/empty-comment.stderr +++ b/src/test/ui/empty/empty-comment.stderr @@ -5,7 +5,7 @@ LL | macro_rules! one_arg_macro { | -------------------------- when calling this macro ... LL | one_arg_macro!(/**/); //~ ERROR unexpected end - | ^^^^^^^^^^^^^^^^^^^^^ unexpected end of macro invocation + | ^^^^^^^^^^^^^^^^^^^^^ missing tokens in macro arguments error: aborting due to previous error diff --git a/src/test/ui/fail-simple.stderr b/src/test/ui/fail-simple.stderr index 4a4aec5b6ac..9759249342a 100644 --- a/src/test/ui/fail-simple.stderr +++ b/src/test/ui/fail-simple.stderr @@ -2,7 +2,7 @@ error: no rules expected the token `@` --> $DIR/fail-simple.rs:12:12 | LL | panic!(@); //~ ERROR no rules expected the token `@` - | ^ no rules expected the token `@` + | ^ no rules expected this token in macro call error: aborting due to previous error diff --git a/src/test/ui/issues/issue-7970a.stderr b/src/test/ui/issues/issue-7970a.stderr index 96fb374b58c..2e2e869199c 100644 --- a/src/test/ui/issues/issue-7970a.stderr +++ b/src/test/ui/issues/issue-7970a.stderr @@ -5,7 +5,7 @@ LL | macro_rules! one_arg_macro { | -------------------------- when calling this macro ... LL | one_arg_macro!(); - | ^^^^^^^^^^^^^^^^^ unexpected end of macro invocation + | ^^^^^^^^^^^^^^^^^ missing tokens in macro arguments error: aborting due to previous error diff --git a/src/test/ui/issues/issue-7970b.stderr b/src/test/ui/issues/issue-7970b.stderr index b2feb677863..d49544e6c1e 100644 --- a/src/test/ui/issues/issue-7970b.stderr +++ b/src/test/ui/issues/issue-7970b.stderr @@ -2,7 +2,7 @@ error: unexpected end of macro invocation --> $DIR/issue-7970b.rs:13:1 | LL | macro_rules! test {} - | ^^^^^^^^^^^^^^^^^^^^ + | ^^^^^^^^^^^^^^^^^^^^ missing tokens in macro arguments error: aborting due to previous error 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 19a9cf3a6f5..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,7 +38,7 @@ 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:15 @@ -47,7 +47,7 @@ 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,7 +74,7 @@ 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:15 @@ -83,7 +83,7 @@ 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-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 diff --git a/src/test/ui/parser/macro/macro-doc-comments-1.stderr b/src/test/ui/parser/macro/macro-doc-comments-1.stderr index 1e765dcde4f..c40a7badaac 100644 --- a/src/test/ui/parser/macro/macro-doc-comments-1.stderr +++ b/src/test/ui/parser/macro/macro-doc-comments-1.stderr @@ -5,7 +5,7 @@ LL | macro_rules! outer { | ------------------ when calling this macro ... LL | //! Inner - | ^^^^^^^^^ no rules expected the token `!` + | ^^^^^^^^^ no rules expected this token in macro call error: aborting due to previous error diff --git a/src/test/ui/parser/macro/macro-doc-comments-2.stderr b/src/test/ui/parser/macro/macro-doc-comments-2.stderr index 0ab8a3cafb5..7bdd432808c 100644 --- a/src/test/ui/parser/macro/macro-doc-comments-2.stderr +++ b/src/test/ui/parser/macro/macro-doc-comments-2.stderr @@ -5,7 +5,7 @@ LL | macro_rules! inner { | ------------------ when calling this macro ... LL | /// Outer - | ^ no rules expected the token `[` + | ^ no rules expected this token in macro call error: aborting due to previous error diff --git a/src/test/ui/underscore-ident-matcher.stderr b/src/test/ui/underscore-ident-matcher.stderr index e148c48ed13..171e81e2d87 100644 --- a/src/test/ui/underscore-ident-matcher.stderr +++ b/src/test/ui/underscore-ident-matcher.stderr @@ -5,7 +5,7 @@ LL | macro_rules! identity { | --------------------- when calling this macro ... LL | let identity!(_) = 10; //~ ERROR no rules expected the token `_` - | ^ no rules expected the token `_` + | ^ no rules expected this token in macro call error: aborting due to previous error diff --git a/src/test/ui/vec/vec-macro-with-comma-only.stderr b/src/test/ui/vec/vec-macro-with-comma-only.stderr index 856d85ef5cd..74f5d2326ac 100644 --- a/src/test/ui/vec/vec-macro-with-comma-only.stderr +++ b/src/test/ui/vec/vec-macro-with-comma-only.stderr @@ -2,7 +2,7 @@ error: no rules expected the token `,` --> $DIR/vec-macro-with-comma-only.rs:12:10 | LL | vec![,]; //~ ERROR no rules expected the token `,` - | ^ no rules expected the token `,` + | ^ no rules expected this token in macro call error: aborting due to previous error |