Merge pull request #506 from ehuss/tests-1.69

Fix test for 1.69
rust-lang · Feb 25, 2023 · 4fec76c · 4fec76c
2 parents f258850 + afaf2a4
commit 4fec76c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/tests/error-tests/tests/error_across_mod.rs b/tests/error-tests/tests/error_across_mod.rs
@@ -14,7 +14,9 @@ fn test() {
 //                        ^ERR(>=1.63.0-beta) unexpected
 //  ^^^^^^^^^^^^^^^^^^^^^^^^HELP(>=1.63.0,<1.65.0-beta) remove the extra argument
 //  ^^^^^^^^^^^^^^^^^^^^^^^^HELP(>=1.63.0,<1.65.0-beta) /Accept Replacement:.*/
-//                       ^^^HELP(>=1.65.0-beta) remove the extra argument
-//                       ^^^HELP(>=1.65.0-beta) /Accept Replacement:.*/
+//                       ^^^HELP(>=1.65.0-beta,<1.69.0-beta) remove the extra argument
+//                       ^^^HELP(>=1.65.0-beta,<1.69.0-beta) /Accept Replacement:.*/
+//                        ^HELP(>=1.69.0-beta) remove the extra argument
+//                        ^HELP(>=1.69.0-beta) /Accept Replacement:.*/
 //  ^^^^^^^^^^^^^^^^^^^^^MSG(>=1.43.0-beta) See Also: error_across_mod_f.rs:1
 }
diff --git a/tests/message-order/tests/test_all_levels.rs b/tests/message-order/tests/test_all_levels.rs
@@ -1,7 +1,7 @@
 trait Trait {}
 
-// This triggers a warning about lifetimes with help.
-fn f2<'a: 'static>(_: &'a i32) {}
+// This triggers a warning about missing `dyn`
+fn Foo(x: &Fn()) {}
 
 pub fn f() {
     let x = Box::new(0u32);

diff --git a/tests/test_message_order.py b/tests/test_message_order.py
@@ -38,7 +38,7 @@
     {'command': 'build',
      'path': 'tests/test_all_levels.rs',
      'messages': [
-        (2, 'tests/test_all_levels.rs', 'WARN', (3, 8), 'tests/test_all_levels.rs:4', ' --> tests/test_all_levels.rs:4:7'),
+        (2, 'tests/test_all_levels.rs', 'WARN', (3, 15), 'tests/test_all_levels.rs:4', ' --> tests/test_all_levels.rs:4:12'),
         (1, 'tests/test_all_levels.rs', 'ERR', (8, 25), 'tests/test_all_levels.rs:9', ' --> tests/test_all_levels.rs:9:25'),
      ]
     },
@@ -64,7 +64,7 @@ def setUp(self):
         # Set a base version for these tests.
         version = util.get_rustc_version(sublime.active_window(), plugin_path)
         if semver.match(version, '<1.62.0-beta'):
-            self.skipTest('Tests require rust 1.46 or newer.')
+            self.skipTest('Tests require rust 1.62 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.