Skip to content

Commit 4fec76c

Browse files
authored
Merge pull request #506 from ehuss/tests-1.69
Fix test for 1.69
2 parents f258850 + afaf2a4 commit 4fec76c

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

tests/error-tests/tests/error_across_mod.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ fn test() {
1414
// ^ERR(>=1.63.0-beta) unexpected
1515
// ^^^^^^^^^^^^^^^^^^^^^^^^HELP(>=1.63.0,<1.65.0-beta) remove the extra argument
1616
// ^^^^^^^^^^^^^^^^^^^^^^^^HELP(>=1.63.0,<1.65.0-beta) /Accept Replacement:.*/
17-
// ^^^HELP(>=1.65.0-beta) remove the extra argument
18-
// ^^^HELP(>=1.65.0-beta) /Accept Replacement:.*/
17+
// ^^^HELP(>=1.65.0-beta,<1.69.0-beta) remove the extra argument
18+
// ^^^HELP(>=1.65.0-beta,<1.69.0-beta) /Accept Replacement:.*/
19+
// ^HELP(>=1.69.0-beta) remove the extra argument
20+
// ^HELP(>=1.69.0-beta) /Accept Replacement:.*/
1921
// ^^^^^^^^^^^^^^^^^^^^^MSG(>=1.43.0-beta) See Also: error_across_mod_f.rs:1
2022
}

tests/message-order/tests/test_all_levels.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
trait Trait {}
22

3-
// This triggers a warning about lifetimes with help.
4-
fn f2<'a: 'static>(_: &'a i32) {}
3+
// This triggers a warning about missing `dyn`
4+
fn Foo(x: &Fn()) {}
55

66
pub fn f() {
77
let x = Box::new(0u32);

tests/test_message_order.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
{'command': 'build',
3939
'path': 'tests/test_all_levels.rs',
4040
'messages': [
41-
(2, 'tests/test_all_levels.rs', 'WARN', (3, 8), 'tests/test_all_levels.rs:4', ' --> tests/test_all_levels.rs:4:7'),
41+
(2, 'tests/test_all_levels.rs', 'WARN', (3, 15), 'tests/test_all_levels.rs:4', ' --> tests/test_all_levels.rs:4:12'),
4242
(1, 'tests/test_all_levels.rs', 'ERR', (8, 25), 'tests/test_all_levels.rs:9', ' --> tests/test_all_levels.rs:9:25'),
4343
]
4444
},
@@ -64,7 +64,7 @@ def setUp(self):
6464
# Set a base version for these tests.
6565
version = util.get_rustc_version(sublime.active_window(), plugin_path)
6666
if semver.match(version, '<1.62.0-beta'):
67-
self.skipTest('Tests require rust 1.46 or newer.')
67+
self.skipTest('Tests require rust 1.62 or newer.')
6868

6969
# Make it so that the build target is automatically determined from
7070
# the active view so each test doesn't have to specify it.

0 commit comments

Comments
 (0)