From c1f3d1520efc91ec79dfafd6ab0e679872092487 Mon Sep 17 00:00:00 2001 From: Adonis Date: Sat, 2 Feb 2019 12:03:38 +0100 Subject: Changing error message to reflect changes with the 2018 edition Signed-off-by: Adonis Update src/libsyntax/ext/tt/quoted.rs Co-Authored-By: asettouf Update src/libsyntax/ext/tt/quoted.rs Co-Authored-By: asettouf Update src/libsyntax/ext/tt/quoted.rs Co-Authored-By: asettouf Update src/libsyntax/ext/tt/quoted.rs Co-Authored-By: asettouf Update src/libsyntax/ext/tt/quoted.rs Co-Authored-By: asettouf Update src/libsyntax/ext/tt/quoted.rs Co-Authored-By: asettouf Update src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.stderr Co-Authored-By: asettouf Update src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.stderr Co-Authored-By: asettouf Stabilize split_ascii_whitespace Tracking issue FCP to merge: https://github.com/rust-lang/rust/issues/48656#issuecomment-442372750 fix stabilization order of uniform_paths. hir: add HirId to main Hir nodes Fix `std::os::fortanix_sgx::usercalls::raw::UsercallNrs` Fixes https://github.com/fortanix/rust-sgx/issues/88 Update src/libsyntax/ext/tt/quoted.rs Co-Authored-By: asettouf Revert "Merge remote-tracking branch 'upstream/master'" This reverts commit 751f05bd155e2c55d4177fe8211df634faf3a644, reversing changes made to 545a3e62b0cb473108869a61b271bc589afb49da. --- src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.stderr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/test') 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 -- cgit 1.4.1-3-g733a5