Merge pull request #420 from ehuss/rust-1.41

ehuss · web-flow · commit bcdb7b84dfe6 · 2019-12-14T12:26:55.000-08:00
Update test for 1.41.
diff --git a/tests/error-tests/examples/no_main.rs b/tests/error-tests/examples/no_main.rs
@@ -5,9 +5,9 @@
 //^^^^^^^^^^^^^^^^ERR(>=1.39.0-beta,rust_syntax_checking_include_tests=False) the main function must be defined
 //^^^^^^^^^^^^^^^^NOTE(>=1.39.0-beta,rust_syntax_checking_include_tests=False) you have one or more functions named `main`
 //^^^^^^^^^^^^^^^^HELP(>=1.39.0-beta,rust_syntax_checking_include_tests=False) either move the `main`
-//^^^^^^^^^^^^^^^^MSG(>=1.39.0-beta,rust_syntax_checking_include_tests=False) See Also: no_main_mod.rs:4
+//^^^^^^^^^^^^^^^^MSG(>=1.39.0-beta,rust_syntax_checking_include_tests=False) See Also: no_main_mod.rs:6
 // When --profile=test is used with `cargo check`, this error will not happen
 // due to the synthesized main created by the test harness.
 // end-msg: ERR(<1.39.0-beta,rust_syntax_checking_include_tests=False OR <1.23.0,rust_syntax_checking_include_tests=True) /`?main`? function not found/
 // end-msg: NOTE(<1.39.0-beta,rust_syntax_checking_include_tests=False OR <1.23.0,rust_syntax_checking_include_tests=True) the main function must be defined
-// end-msg: MSG(<1.39.0-beta,rust_syntax_checking_include_tests=False OR <1.23.0,rust_syntax_checking_include_tests=True) See Also: no_main_mod.rs:4
+// end-msg: MSG(<1.39.0-beta,rust_syntax_checking_include_tests=False OR <1.23.0,rust_syntax_checking_include_tests=True) See Also: no_main_mod.rs:6
diff --git a/tests/error-tests/examples/no_main_mod.rs b/tests/error-tests/examples/no_main_mod.rs
@@ -1,6 +1,8 @@
 /*BEGIN*/fn main() {
-//       ^^^^^^^^^WARN(>=1.23.0,rust_syntax_checking_include_tests=True) function is never used
-//       ^^^^^^^^^NOTE(>=1.23.0,rust_syntax_checking_include_tests=True) #[warn(dead_code)]
+//          ^^^^WARN(>=1.41.0-beta,rust_syntax_checking_include_tests=True) function is never used
+//          ^^^^NOTE(>=1.41.0-beta,rust_syntax_checking_include_tests=True) #[warn(dead_code)]
+//       ^^^^^^^^^WARN(>=1.23.0,<1.41.0-beta,rust_syntax_checking_include_tests=True) function is never used
+//       ^^^^^^^^^NOTE(>=1.23.0,<1.41.0-beta,rust_syntax_checking_include_tests=True) #[warn(dead_code)]
 }/*END*/
 // ~NOTE(rust_syntax_checking_include_tests=False OR <1.23.0,rust_syntax_checking_include_tests=True) here is a function named
 // ~MSG(rust_syntax_checking_include_tests=False OR <1.23.0,rust_syntax_checking_include_tests=True) See Primary: no_main.rs
diff --git a/tests/error-tests/tests/macro-expansion-inside-2.rs b/tests/error-tests/tests/macro-expansion-inside-2.rs
@@ -6,5 +6,6 @@ mod macro_expansion_inside_mod2;
 fn f() {
     let x: () = example_bad_value!();
 //              ^^^^^^^^^^^^^^^^^^^^HELP in this macro invocation
+//         ^^ERR(>=1.41.0-beta) expected due to this
 //              ^^^^^^^^^^^^^^^^^^^^MSG See Primary: macro_expansion_inside_mod2.rs:3
 }
diff --git a/tests/error-tests/tests/macro-expansion-outside-1.rs b/tests/error-tests/tests/macro-expansion-outside-1.rs
@@ -9,7 +9,8 @@ extern crate dcrate;
 /*BEGIN*/example_bad_syntax!{}/*END*/
 // ~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 .* here/
+// ~ERR(>=1.20.0,<1.41.0-beta) /expected one of .* here/
+// ~ERR(>=1.41.0-beta) /expected one of .* tokens/
 // ~ERR(>=1.20.0,<1.24.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
diff --git a/tests/error-tests/tests/macro-expansion-outside-2.rs b/tests/error-tests/tests/macro-expansion-outside-2.rs
@@ -9,7 +9,9 @@ fn f() {
     let x: () = example_bad_value!();
 //              ^^^^^^^^^^^^^^^^^^^^ERR mismatched types
 //              ^^^^^^^^^^^^^^^^^^^^ERR this error originates in a macro outside
-//              ^^^^^^^^^^^^^^^^^^^^ERR expected (), found i32
-//              ^^^^^^^^^^^^^^^^^^^^NOTE expected type
+//              ^^^^^^^^^^^^^^^^^^^^ERR(>=1.41.0-beta) expected `()`, found `i32`
+//              ^^^^^^^^^^^^^^^^^^^^ERR(<1.41.0-beta) expected (), found i32
+//         ^^ERR(>=1.41.0-beta) expected due to this
+//              ^^^^^^^^^^^^^^^^^^^^NOTE(<1.41.0-beta) expected type
 //              ^^^^^^^^^^^^^^^^^^^^NOTE(<1.16.0) found type
 }
diff --git a/tests/error-tests/tests/macro_expansion_inside_mod1.rs b/tests/error-tests/tests/macro_expansion_inside_mod1.rs
@@ -6,7 +6,8 @@ macro_rules! example_bad_syntax {
             // syntax errors.
             Kind(x: u32)
 //                ^ERR /expected one of .*, found `:`/
-//                ^ERR(>=1.18.0) /expected one of .* here/
+//                ^ERR(>=1.41.0-beta) /expected one of .* tokens/
+//                ^ERR(>=1.18.0,<1.41.0-beta) /expected one of .* here/
 //                ^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
diff --git a/tests/error-tests/tests/macro_expansion_inside_mod2.rs b/tests/error-tests/tests/macro_expansion_inside_mod2.rs
@@ -2,8 +2,9 @@
 macro_rules! example_bad_value {
     () => (1i32)
 //         ^^^^ERR mismatched types
-//         ^^^^ERR expected (), found i32
-//         ^^^^NOTE expected type `()`
+//         ^^^^ERR(>=1.41.0-beta) expected `()`, found `i32`
+//         ^^^^ERR(<1.41.0-beta) expected (), found i32
+//         ^^^^NOTE(<1.41.0-beta) expected type `()`
 //         ^^^^NOTE(<1.16.0) found type `i32`
 //         ^^^^MSG See Also: macro-expansion-inside-2.rs:7
 }
diff --git a/tests/multi-targets/src/altmain.rs b/tests/multi-targets/src/altmain.rs
@@ -3,8 +3,10 @@ fn main() {
 }
 
 /*BEGIN*/fn warning_example() {
-//       ^^^^^^^^^^^^^^^^^^^^WARN(>=1.22.0) function is never used
-//       ^^^^^^^^^^^^^^^^^^^^NOTE(>=1.22.0) #[warn(dead_code)]
+//          ^^^^^^^^^^^^^^^WARN(>=1.41.0-beta) function is never used
+//          ^^^^^^^^^^^^^^^NOTE(>=1.41.0-beta) #[warn(dead_code)]
+//       ^^^^^^^^^^^^^^^^^^^^WARN(>=1.22.0,<1.41.0-beta) function is never used
+//       ^^^^^^^^^^^^^^^^^^^^NOTE(>=1.22.0,<1.41.0-beta) #[warn(dead_code)]
 }/*END*/
 // ~WARN(<1.22.0) function is never used
 // ~NOTE(<1.22.0,>=1.17.0) #[warn(dead_code)]
diff --git a/tests/multi-targets/src/lib.rs b/tests/multi-targets/src/lib.rs
@@ -5,8 +5,10 @@ pub fn libf1() {
 }
 
 /*BEGIN*/fn unused() {
-//       ^^^^^^^^^^^WARN(>=1.22.0) function is never used
-//       ^^^^^^^^^^^NOTE(>=1.22.0) #[warn(dead_code)]
+//          ^^^^^^WARN(>=1.41.0-beta) function is never used
+//          ^^^^^^NOTE(>=1.41.0-beta) #[warn(dead_code)]
+//       ^^^^^^^^^^^WARN(>=1.22.0,<1.41.0-beta) function is never used
+//       ^^^^^^^^^^^NOTE(>=1.22.0,<1.41.0-beta) #[warn(dead_code)]
 }/*END*/
 // ~WARN(<1.22.0) function is never used
 // ~NOTE(<1.22.0,>=1.17.0) #[warn(dead_code)]
diff --git a/tests/multi-targets/tests/common/helpers.rs b/tests/multi-targets/tests/common/helpers.rs
@@ -1,14 +1,17 @@
 // Example of a module shared among test code.
 
 /*BEGIN*/pub fn helper() {
-//       ^^^^^^^^^^^^^^^WARN(>=1.22.0) function is never used
-//       ^^^^^^^^^^^^^^^NOTE(>=1.22.0) #[warn(dead_code)]
+//              ^^^^^^WARN(>=1.41.0-beta) function is never used
+//              ^^^^^^NOTE(>=1.41.0-beta) #[warn(dead_code)]
+//       ^^^^^^^^^^^^^^^WARN(>=1.22.0,<1.41.0-beta) function is never used
+//       ^^^^^^^^^^^^^^^NOTE(>=1.22.0,<1.41.0-beta) #[warn(dead_code)]
 }/*END*/
 // ~WARN(<1.22.0) function is never used
 // ~NOTE(<1.22.0,>=1.17.0) #[warn(dead_code)]
 
 /*BEGIN*/pub fn unused() {
-//       ^^^^^^^^^^^^^^^WARN(>=1.22.0) function is never used
+//              ^^^^^^WARN(>=1.41.0-beta) function is never used
+//       ^^^^^^^^^^^^^^^WARN(>=1.22.0,<1.41.0-beta) function is never used
 //       ^^^^^^^^^^^^^^^NOTE(>=1.22.0,<1.24.0-beta) #[warn(dead_code)]
 }/*END*/
 // ~WARN(<1.22.0) function is never used
diff --git a/tests/test_message_order.py b/tests/test_message_order.py
@@ -29,9 +29,9 @@
     {'command': 'build',
      'path': 'examples/ex_warning1.rs',
      'messages': [
-        (1, 'examples/warning1.rs', 'WARN', (0, 13), 'examples/warning1.rs:1', ' --> examples/warning1.rs:1:1'),
-        (2, 'examples/warning1.rs', 'WARN', (4, 13), 'examples/warning1.rs:5', ' --> examples/warning1.rs:5:1'),
-        (3, 'examples/warning2.rs', 'WARN', (81, 16), 'examples/warning2.rs:82', '  --> examples/warning2.rs:82:1'),
+        (1, 'examples/warning1.rs', 'WARN', (0, 11), 'examples/warning1.rs:1', ' --> examples/warning1.rs:1:4'),
+        (2, 'examples/warning1.rs', 'WARN', (4, 11), 'examples/warning1.rs:5', ' --> examples/warning1.rs:5:4'),
+        (3, 'examples/warning2.rs', 'WARN', (81, 14), 'examples/warning2.rs:82', '  --> examples/warning2.rs:82:4'),
      ]
     },
 
@@ -62,8 +62,8 @@ def setUp(self):
         super(TestMessageOrder, self).setUp()
         # Set a base version for these tests.
         version = util.get_rustc_version(sublime.active_window(), plugin_path)
-        if semver.match(version, '<1.27.0'):
-            self.skipTest('Tests require rust 1.27 or newer.')
+        if semver.match(version, '<1.41.0-beta'):
+            self.skipTest('Tests require rust 1.41 or newer.')
 
         # Make it so that the build target is automatically determined from
         # the active view so each test doesn't have to specify it.
diff --git a/tests/workspace/workspace2/src/lib.rs b/tests/workspace/workspace2/src/lib.rs
@@ -6,10 +6,13 @@ pub fn f() {
     let x = Box::new(0u32);
     let y: &dyn Trait = x;
 //                      ^ERR(<1.29.0-beta) expected &Trait, found
-//                      ^ERR(>=1.29.0-beta) expected &dyn Trait, found
+//                      ^ERR(>=1.41.0-beta) expected `&dyn Trait`, found
+//                      ^ERR(>=1.29.0-beta,<1.41.0-beta) expected &dyn Trait, found
 //                      ^ERR mismatched types
+//         ^^^^^^^^^^ERR(>=1.41.0-beta) expected due to this
 //                      ^NOTE(<1.29.0-beta) expected type `&Trait`
-//                      ^NOTE(>=1.29.0-beta) expected type `&dyn Trait`
+//                      ^NOTE(>=1.41.0-beta) expected reference `&dyn Trait`
+//                      ^NOTE(>=1.29.0,<1.41.0-beta) expected type `&dyn Trait`
 //                      ^NOTE(<1.16.0) found type
 //                      ^HELP(>=1.18.0,<1.24.0) try with `&x`
 //                      ^HELP(>=1.24.0-beta) consider borrowing here

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,6 @@ mod macro_expansion_inside_mod2;`
`6`	`6`	`fn f() {`
`7`	`7`	`let x: () = example_bad_value!();`
`8`	`8`	`// ^^^^^^^^^^^^^^^^^^^^HELP in this macro invocation`
	`9`	`+// ^^ERR(>=1.41.0-beta) expected due to this`
`9`	`10`	`// ^^^^^^^^^^^^^^^^^^^^MSG See Primary: macro_expansion_inside_mod2.rs:3`
`10`	`11`	`}`