Merge #374

374: Update tests for recent message format changes. r=ehuss a=ehuss



Co-authored-by: Eric Huss <[email protected]>

Author: bors[bot]

tests/error-tests/tests/E0005.rs

@@ -7,6 +7,7 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
+#![allow(unused)]
 
 fn main() {
     let x = Some(1);

tests/error-tests/tests/binop-mul-bool.rs

@@ -13,5 +13,9 @@
 fn main() { let x = true * false; }
 //                  ^^^^ERR(<1.19.0) binary operation
 //                  ^^^^NOTE(<1.19.0) an implementation of
-//                  ^^^^^^^^^^^^ERR(>=1.19.0) binary operation
-//                  ^^^^^^^^^^^^NOTE(>=1.19.0) an implementation of
+//                  ^^^^^^^^^^^^ERR(>=1.19.0,<1.35.0-beta) binary operation
+//                  ^^^^^^^^^^^^NOTE(>=1.19.0,<1.35.0-beta) an implementation of
+//                       ^ERR(>=1.35.0-beta) binary operation
+//                       ^NOTE(>=1.35.0-beta) an implementation of
+//                  ^^^^ERR(>=1.35.0-beta) bool
+//                         ^^^^^ERR(>=1.35.0-beta) bool

tests/error-tests/tests/macro-expansion-inside-1.rs

@@ -5,6 +5,6 @@ mod macro_expansion_inside_mod1;
 
 /*BEGIN*/example_bad_syntax!{}/*END*/
 // ~HELP(>=1.20.0) in this macro invocation
-// ~HELP(>=1.20.0) in this macro invocation
-// ~MSG(>=1.20.0) See Primary: macro_expansion_inside_mod1.rs:7
+// ~HELP(>=1.20.0,<1.34.0-beta) in this macro invocation
 // ~MSG(>=1.20.0) See Primary: macro_expansion_inside_mod1.rs:7
+// ~MSG(>=1.20.0,<1.34.0-beta) See Primary: macro_expansion_inside_mod1.rs:7

tests/error-tests/tests/macro-expansion-outside-1.rs

@@ -11,21 +11,21 @@ extern crate dcrate;
 // ~ERR(>=1.20.0) this error originates in a macro outside of the current crate
 // ~ERR(>=1.20.0) /expected one of .* here/
 // ~ERR(>=1.20.0,<1.24.0-beta) unexpected token
-// ~ERR(>=1.20.0) /expected one of .*, found `:`/
-// ~ERR(>=1.20.0) this error originates in a macro outside of the current crate
-// ~ERR(>=1.20.0) expected one of
-// ~ERR(>=1.32.0-beta) in this macro
-// ~ERR(>=1.20.0,<1.24.0-beta) unexpected token
-// end-msg: ERR(>=1.19.0,<1.20.0-beta) /expected one of .*, found `:`/
-// end-msg: ERR(>=1.19.0,<1.20.0-beta) Errors occurred in macro <example_bad_syntax macros> from external crate
-// end-msg: ERR(>=1.19.0,<1.20.0-beta) Macro text: (  ) => { enum E { Kind ( x : u32 ) } }
-// end-msg: ERR(>=1.19.0,<1.20.0-beta) /expected one of .* here/
-// end-msg: ERR(>=1.19.0,<1.20.0-beta) unexpected token
-// end-msg: ERR(>=1.19.0,<1.20.0-beta) /expected one of .*, found `:`/
-// end-msg: ERR(>=1.19.0,<1.20.0-beta) Errors occurred in macro <example_bad_syntax macros> from external crate
-// end-msg: ERR(>=1.19.0,<1.20.0-beta) Macro text: (  ) => { enum E { Kind ( x : u32 ) } }
-// end-msg: ERR(>=1.19.0,<1.20.0-beta) expected one of 7 possible tokens here
-// end-msg: ERR(>=1.19.0,<1.20.0-beta) unexpected token
+// ~ERR(>=1.20.0,<1.34.0-beta) /expected one of .*, found `:`/
+// ~ERR(>=1.20.0,<1.34.0-beta) this error originates in a macro outside of the current crate
+// ~ERR(>=1.20.0,<1.34.0-beta) expected one of
+// ~ERR(>=1.32.0,<1.34.0-beta) in this macro
+// ~ERR(>=1.20.0,<1.24.0) unexpected token
+// end-msg: ERR(>=1.19.0,<1.20.0) /expected one of .*, found `:`/
+// end-msg: ERR(>=1.19.0,<1.20.0) Errors occurred in macro <example_bad_syntax macros> from external crate
+// end-msg: ERR(>=1.19.0,<1.20.0) Macro text: (  ) => { enum E { Kind ( x : u32 ) } }
+// end-msg: ERR(>=1.19.0,<1.20.0) /expected one of .* here/
+// end-msg: ERR(>=1.19.0,<1.20.0) unexpected token
+// end-msg: ERR(>=1.19.0,<1.20.0) /expected one of .*, found `:`/
+// end-msg: ERR(>=1.19.0,<1.20.0) Errors occurred in macro <example_bad_syntax macros> from external crate
+// end-msg: ERR(>=1.19.0,<1.20.0) Macro text: (  ) => { enum E { Kind ( x : u32 ) } }
+// end-msg: ERR(>=1.19.0,<1.20.0) expected one of 7 possible tokens here
+// end-msg: ERR(>=1.19.0,<1.20.0) unexpected token
 // end-msg: ERR(<1.19.0) /expected one of .*, found `:`/
 // end-msg: ERR(<1.19.0) Errors occurred in macro <example_bad_syntax macros> from external crate
 // end-msg: ERR(<1.19.0) Macro text: (  ) => { enum E { Kind ( x : u32 ) } }

tests/error-tests/tests/macro_expansion_inside_mod1.rs

@@ -8,9 +8,9 @@ macro_rules! example_bad_syntax {
 //                ^ERR /expected one of .*, found `:`/
 //                ^ERR(>=1.18.0) /expected one of .* here/
 //                ^MSG(>=1.20.0) See Also: macro-expansion-inside-1.rs:6
-//                ^ERR /expected one of .*, found `:`/
-//                ^ERR(>=1.18.0) expected one of
-//                ^MSG(>=1.20.0) See Also: macro-expansion-inside-1.rs:6
+//                ^ERR(<1.34.0-beta) /expected one of .*, found `:`/
+//                ^ERR(>=1.18.0,<1.34.0-beta) expected one of
+//                ^MSG(>=1.20.0,<1.34.0-beta) See Also: macro-expansion-inside-1.rs:6
         }
     }
 }