Merge pull request #541 from ehuss/rust-1.89

Update tests for 1.89

Author: ehuss

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

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

tests/test_click_handler.py

@@ -6,13 +6,15 @@
 
 
 REPLACEMENT_TESTS = [
-    ('tests/error-tests/tests/cast-to-unsized-trait-object-suggestion.rs', None,
+    ('tests/error-tests/tests/cast-to-unsized-trait-object-suggestion.rs', '>=1.89.0-beta',
         # Before
         ((11, '    &1 as dyn Send;'),
-         (15, '    Box::new(1) as dyn Send;')),
+         (17, '    Box::new(1) as dyn Send;')),
         # After
         ((11, '    &1 as &dyn Send;'),
-         (15, '    Box::new(1) as Box<dyn Send>;')),
+         (17, '    Box::new(1) as Box<dyn Send;'),
+         (17, '    Box::new(1) as Box<dyn Send>;'),
+         ),
     ),
     ('tests/error-tests/tests/impl-generic-mismatch.rs', '>=1.83.0-beta',
         # Before

tests/test_phantom_style.py

@@ -6,6 +6,9 @@
 class TestPhantomStyle(TestBase):
 
     def test_style_none(self):
+        rustc_version = util.get_rustc_version(sublime.active_window(), plugin_path)
+        if semver.match(rustc_version, '<1.89.0-beta'):
+            return
         self._override_setting('rust_phantom_style', 'none')
         self._with_open_file('tests/error-tests/tests/cast-to-unsized-trait-object-suggestion.rs',
             self._test_style_none)
@@ -20,9 +23,12 @@ def _test_style_none(self, view):
             regions = ui.view_regions[view.file_name()]
             # Extremely basic check, the number of unique regions displayed.
             rs = [(r.a, r.b) for r in regions]
-            self.assertEqual(len(set(rs)), 4)
+            self.assertEqual(len(set(rs)), 5)
 
     def test_style_popup(self):
+        rustc_version = util.get_rustc_version(sublime.active_window(), plugin_path)
+        if semver.match(rustc_version, '<1.89.0-beta'):
+            return
         self._override_setting('rust_phantom_style', 'popup')
         self._with_open_file('tests/error-tests/tests/cast-to-unsized-trait-object-suggestion.rs',
             self._test_style_popup)
@@ -37,7 +43,7 @@ def _test_style_popup(self, view):
             regions = ui.view_regions[view.file_name()]
             # Extremely basic check, the number of unique regions displayed.
             rs = [(r.a, r.b) for r in regions]
-            self.assertEqual(len(set(rs)), 4)
+            self.assertEqual(len(set(rs)), 5)
             # Trigger popup.
             self.assertEqual(len(ui.popups), 0)
             for region in regions:
@@ -48,7 +54,7 @@ def _test_style_popup(self, view):
                 ui.popups.clear()
 
             # Trigger gutter hover.
-            for lineno in (12, 16):
+            for lineno in (12, 18):
                 pt = view.text_point(lineno - 1, 0)
                 messages.message_popup(view, pt, sublime.HOVER_GUTTER)
                 popups = ui.popups[view.file_name()]