Skip to content

Commit 41b23d7

Browse files
committed
Minor updates for rust 1.17.
1 parent a60e264 commit 41b23d7

File tree

6 files changed

+11
-8
lines changed

6 files changed

+11
-8
lines changed

tests/error-tests/tests/test_unicode.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
fn main() {
44
let foo = "❤";
55
// ^WARN unused variable
6+
// ^^NOTE(>=1.17.0) #[warn(unused_variables)]
67
}

tests/multi-targets/src/altmain.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ fn main() {
55
fn warning_example() {
66
}
77
// ^WARN function is never used
8+
// ^^NOTE(>=1.17.0) #[warn(dead_code)]

tests/multi-targets/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ pub fn libf1() {
77
fn unused() {
88
}
99
// ^WARN function is never used
10-
// ^^NOTE(clippy) #[warn(dead_code)]
10+
// ^^NOTE(>=1.17.0) #[warn(dead_code)]

tests/multi-targets/src/lmod1.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ pub fn fmod1() {
22
println!("fmod1");
33
d();
44
// ^WARN deprecated
5+
// ^^NOTE(>=1.17.0) #[warn(deprecated)]
56
}
67

78
#[deprecated]

tests/multi-targets/tests/common/helpers.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ pub fn helper() {
44

55
}
66
// ^WARN function is never used
7+
// ^^NOTE(>=1.17.0) #[warn(dead_code)]
78

89
pub fn unused() {
910

1011
}
1112
// ^WARN function is never used
13+
// ^^NOTE(>=1.17.0) #[warn(dead_code)]

tests/test_syntax_check.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010

1111
class TestSyntaxCheck(TestBase):
1212

13+
def setUp(self):
14+
super(TestSyntaxCheck, self).setUp()
15+
self.rustc_version = util.get_rustc_version(sublime.active_window(),
16+
plugin_path)
17+
1318
def test_messages(self):
1419
"""Test message generation.
1520
@@ -31,9 +36,6 @@ def test_messages(self):
3136
formatting of messages. Hopefully these examples are relatively
3237
stable for now.
3338
"""
34-
self.rustc_version = util.get_rustc_version(sublime.active_window(),
35-
plugin_path)
36-
3739
to_test = [
3840
'multi-targets/src/lib.rs',
3941
'multi-targets/src/lmod1.rs',
@@ -76,7 +78,6 @@ def test_clippy_messages(self):
7678
"""Test clippy messages."""
7779
to_test = [
7880
'tests/error-tests/examples/clippy_ex.rs',
79-
'tests/multi-targets/src/lib.rs',
8081
]
8182
for path in to_test:
8283
self._with_open_file(path, self._test_messages, methods=['clippy'])
@@ -131,9 +132,6 @@ def restriction_check(restrictions):
131132
# blocks (see
132133
# https://github.com/rust-lang/cargo/issues/3431)
133134
return False
134-
elif check == 'clippy':
135-
if method != 'clippy':
136-
return False
137135
else:
138136
if not semver.match(self.rustc_version, check):
139137
return False

0 commit comments

Comments
 (0)