No separator for `?`. No `?` as a separator.

[rust.git] / src / test / ui / macros / macro-at-most-once-rep-ambig.stderr

diff --git a/src/test/ui/macros/macro-at-most-once-rep-ambig.stderr b/src/test/ui/macros/macro-at-most-once-rep-ambig.stderr
index 67a77e0a481d86319320b6b8a808e89177de7c99..eb355c70b559375c5efc5e1b810037f3d8898918 100644 (file)
--- a/src/test/ui/macros/macro-at-most-once-rep-ambig.stderr
+++ b/src/test/ui/macros/macro-at-most-once-rep-ambig.stderr
@@ -1,80 +1,62 @@
-error: no rules expected the token `?`
-  --> $DIR/macro-at-most-once-rep-ambig.rs:40:11
+error: `?` macro repetition does not allow a separator
+  --> $DIR/macro-at-most-once-rep-ambig.rs:29:10
    |
-40 |     foo!(a?a?a); //~ ERROR no rules expected the token `?`
-   |           ^
-
-error: no rules expected the token `?`
-  --> $DIR/macro-at-most-once-rep-ambig.rs:41:11
-   |
-41 |     foo!(a?a); //~ ERROR no rules expected the token `?`
-   |           ^
-
-error: no rules expected the token `?`
-  --> $DIR/macro-at-most-once-rep-ambig.rs:42:11
-   |
-42 |     foo!(a?); //~ ERROR no rules expected the token `?`
-   |           ^
+LL |     ($(a),?) => {} //~ ERROR `?` macro repetition does not allow a separator
+   |          ^
 
 error: no rules expected the token `?`
   --> $DIR/macro-at-most-once-rep-ambig.rs:43:11
    |
-43 |     baz!(a?a?a); //~ ERROR no rules expected the token `?`
+LL |     foo!(a?a?a); //~ ERROR no rules expected the token `?`
    |           ^
 
 error: no rules expected the token `?`
   --> $DIR/macro-at-most-once-rep-ambig.rs:44:11
    |
-44 |     baz!(a?a); //~ ERROR no rules expected the token `?`
+LL |     foo!(a?a); //~ ERROR no rules expected the token `?`
    |           ^
 
 error: no rules expected the token `?`
   --> $DIR/macro-at-most-once-rep-ambig.rs:45:11
    |
-45 |     baz!(a?); //~ ERROR no rules expected the token `?`
+LL |     foo!(a?); //~ ERROR no rules expected the token `?`
    |           ^
 
 error: unexpected end of macro invocation
-  --> $DIR/macro-at-most-once-rep-ambig.rs:46:11
-   |
-46 |     baz!(a,); //~ ERROR unexpected end of macro invocation
-   |           ^
-
-error: no rules expected the token `?`
-  --> $DIR/macro-at-most-once-rep-ambig.rs:47:11
+  --> $DIR/macro-at-most-once-rep-ambig.rs:46:5
    |
-47 |     baz!(a?a?a,); //~ ERROR no rules expected the token `?`
-   |           ^
+LL |     barplus!(); //~ ERROR unexpected end of macro invocation
+   |     ^^^^^^^^^^^
 
-error: no rules expected the token `?`
-  --> $DIR/macro-at-most-once-rep-ambig.rs:48:11
+error: unexpected end of macro invocation
+  --> $DIR/macro-at-most-once-rep-ambig.rs:47:5
    |
-48 |     baz!(a?a,); //~ ERROR no rules expected the token `?`
-   |           ^
+LL |     barstar!(); //~ ERROR unexpected end of macro invocation
+   |     ^^^^^^^^^^^
 
 error: no rules expected the token `?`
-  --> $DIR/macro-at-most-once-rep-ambig.rs:49:11
+  --> $DIR/macro-at-most-once-rep-ambig.rs:48:15
    |
-49 |     baz!(a?,); //~ ERROR no rules expected the token `?`
-   |           ^
+LL |     barplus!(a?); //~ ERROR no rules expected the token `?`
+   |               ^
 
 error: unexpected end of macro invocation
-  --> $DIR/macro-at-most-once-rep-ambig.rs:50:5
+  --> $DIR/macro-at-most-once-rep-ambig.rs:49:14
    |
-50 |     barplus!(); //~ ERROR unexpected end of macro invocation
-   |     ^^^^^^^^^^^
+LL |     barplus!(a); //~ ERROR unexpected end of macro invocation
+   |              ^
 
-error: unexpected end of macro invocation
-  --> $DIR/macro-at-most-once-rep-ambig.rs:51:15
+error: no rules expected the token `?`
+  --> $DIR/macro-at-most-once-rep-ambig.rs:50:15
    |
-51 |     barplus!(a?); //~ ERROR unexpected end of macro invocation
+LL |     barstar!(a?); //~ ERROR no rules expected the token `?`
    |               ^
 
 error: unexpected end of macro invocation
-  --> $DIR/macro-at-most-once-rep-ambig.rs:52:15
+  --> $DIR/macro-at-most-once-rep-ambig.rs:51:14
    |
-52 |     barstar!(a?); //~ ERROR unexpected end of macro invocation
-   |               ^
+LL |     barstar!(a); //~ ERROR unexpected end of macro invocation
+   |              ^
 
-error: aborting due to 13 previous errors
+error: aborting due to 10 previous errors