Merge pull request #437 from ehuss/update-1.46

Update tests for 1.46

Author: ehuss

tests/error-tests/tests/cast-to-unsized-trait-object-suggestion.rs

@@ -15,6 +15,7 @@ fn main() {
 //        ^^^^^^^^HELP /Accept Replacement:.*&dyn Send/
     Box::new(1) as dyn Send;
 //  ^^^^^^^^^^^^^^^^^^^^^^^ERR cast to unsized type
-//                 ^^^^^^^^HELP try casting to a `Box` instead
+//                 ^^^^^^^^HELP(<1.46.0-beta) try casting to a `Box` instead
+//                 ^^^^^^^^HELP(>=1.46.0-beta) you can cast to a `Box` instead
 //                 ^^^^^^^^HELP /Accept Replacement:.*Box<dyn Send>/
 }

tests/test_cargo_build.py

@@ -341,7 +341,7 @@ def _test_document_messages_intralink(self, view):
         self._cargo_clean(view)
         self._run_build_wait('doc')
         self._check_added_message(view.window(), view.file_name(),
-            r'cannot be resolved')
+            r'unresolved link')
 
     def _test_document_messages_invalid(self, view):
         self._cargo_clean(view)

tests/test_message_order.py

@@ -51,7 +51,7 @@
         (3, 'tests/test_test_output.rs', 'ERR', (18, 4), 'tests/test_test_output.rs:19:5', 'tests/test_test_output.rs:19:5'),
         (4, 'tests/test_test_output.rs', 'ERR', (23, 4), 'tests/test_test_output.rs:24:5', 'tests/test_test_output.rs:24:5'),
         (5, 'tests/test_test_output.rs', 'ERR', (28, 4), 'tests/test_test_output.rs:29:5', 'tests/test_test_output.rs:29:5'),
-        (6, 'tests/test_test_output.rs', 'ERR', (59, 4), 'tests/test_test_output.rs:60:5', 'tests/test_test_output.rs:60:5'),
+        (6, 'tests/test_test_output.rs', 'ERR', (59, 28), 'tests/test_test_output.rs:60:29', 'tests/test_test_output.rs:60:29'),
      ]
     }
 ]
@@ -63,8 +63,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.42.0-beta'):
-            self.skipTest('Tests require rust 1.42 or newer.')
+        if semver.match(version, '<1.46.0-beta'):
+            self.skipTest('Tests require rust 1.46 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.

tests/workspace/workspace1/src/lib.rs

@@ -3,9 +3,14 @@ mod anothermod;
 /*BEGIN*/struct S {
 //       ^^^^^^^^ERR(>=1.18.0) recursive type has infinite size
 //       ^^^^^^^^ERR(>=1.18.0) recursive type `S` has infinite size
-//       ^^^^^^^^HELP(>=1.18.0) insert indirection
+//       ^^^^^^^^HELP(>=1.18.0,<1.46.0-beta) insert indirection
     recursive: S
-//  ^^^^^^^^^^^^ERR(>=1.19.0) recursive without indirection
+//  ^^^^^^^^^^^^ERR(>=1.19.0,<1.46.0-beta) recursive without indirection
+//             ^ERR(>=1.46.0-beta) recursive without indirection
+//             |HELP(>=1.46.0-beta) insert some indirection
+//             |HELP(>=1.46.0-beta) /Accept Replacement:.*Box</
+//              |HELP(>=1.46.0-beta) insert some indirection
+//              |HELP(>=1.46.0-beta) /Accept Replacement:.*>/
 }/*END*/
 // ~ERR(<1.18.0) recursive type has infinite size
 // ~ERR(<1.18.0) recursive type `S` has infinite size