about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-02-27 13:32:16 +0100
committerGitHub <noreply@github.com>2019-02-27 13:32:16 +0100
commit2f58c2cfc0ca7b10ebf89defeaef3417eb800110 (patch)
treec636916d43149751ba62345e61df732d30501fd2 /src/test
parentf5b5f924eb9bfe7e28984fb3ae43f65ebe2bdaa2 (diff)
parentc1f3d1520efc91ec79dfafd6ab0e679872092487 (diff)
downloadrust-2f58c2cfc0ca7b10ebf89defeaef3417eb800110.tar.gz
rust-2f58c2cfc0ca7b10ebf89defeaef3417eb800110.zip
Rollup merge of #58075 - asettouf:master, r=varkor
Fix for issue  #58050

Hi,

a quick PR to mention in the compiler error message that `?` is a macro operator, as according to issue #58050

It passed `python x.py test src/tools/tidy`  locally, as well as the recommendation to run `/x.py test src/test/ui --stage 1 --bless`.

Let me know if anything else is needed.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.stderr4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.stderr b/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.stderr
index b27b60459d6..cb0a9163b74 100644
--- a/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.stderr
+++ b/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.stderr
@@ -4,7 +4,7 @@ error: expected `*` or `+`
 LL |     ($(a)?) => {} //~ERROR expected `*` or `+`
    |          ^
    |
-   = note: `?` is not a macro repetition operator
+   = note: `?` is not a macro repetition operator in the 2015 edition, but is accepted in the 2018 edition
 
 error: expected `*` or `+`
   --> $DIR/macro-at-most-once-rep-2015-ques-rep.rs:10:11
@@ -12,7 +12,7 @@ error: expected `*` or `+`
 LL |     ($(a),?) => {} //~ERROR expected `*` or `+`
    |           ^
    |
-   = note: `?` is not a macro repetition operator
+   = note: `?` is not a macro repetition operator in the 2015 edition, but is accepted in the 2018 edition
 
 error: aborting due to 2 previous errors