Skip to content

Commit 146874f

Browse files
authored
Allow to rustfix unused_variables lint. (#16082)
### What does this PR try to resolve? The rest cases `cache_messages::wacky_hashless_fingerprint`, `warning_override::config`, `warning_override::requires_nightly`, `warning_override::rustc_caching_deny_first` and `warning_override::rustc_caching_allow_first` are too strict and prevent merging rust-lang/rust#142390. This PR relaxes the expected output to allow for the `cargo fix` suggestion. ### How to test and review this PR? Checkout rustc at rust-lang/rust#142390, change `src/tools/cargo` to this branch, and verify that cargo tests pass.
2 parents 53ff2e5 + a1eed83 commit 146874f

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

tests/testsuite/cache_messages.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ fn wacky_hashless_fingerprint() {
507507
[CHECKING] foo v0.0.1 ([ROOT]/foo)
508508
[WARNING] unused variable: `unused`
509509
...
510-
[WARNING] `foo` (bin "a") generated 1 warning
510+
[WARNING] `foo` (bin "a") generated 1 warning[..]
511511
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
512512
513513
"#]])

tests/testsuite/warning_override.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fn rustc_caching_allow_first() {
5050
|
5151
= [NOTE] `#[warn(unused_variables)]` [..]on by default
5252
53-
[WARNING] `foo` (bin "foo") generated 1 warning
53+
[WARNING] `foo` (bin "foo") generated 1 warning[..]
5454
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
5555
[ERROR] warnings are denied by `build.warnings` configuration
5656
@@ -77,7 +77,7 @@ fn rustc_caching_deny_first() {
7777
|
7878
= [NOTE] `#[warn(unused_variables)]` [..]on by default
7979
80-
[WARNING] `foo` (bin "foo") generated 1 warning
80+
[WARNING] `foo` (bin "foo") generated 1 warning[..]
8181
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
8282
[ERROR] warnings are denied by `build.warnings` configuration
8383
@@ -114,7 +114,7 @@ fn config() {
114114
|
115115
= [NOTE] `#[warn(unused_variables)]` [..]on by default
116116
117-
[WARNING] `foo` (bin "foo") generated 1 warning
117+
[WARNING] `foo` (bin "foo") generated 1 warning[..]
118118
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
119119
[ERROR] warnings are denied by `build.warnings` configuration
120120
@@ -138,7 +138,7 @@ fn config() {
138138
|
139139
= [NOTE] `#[warn(unused_variables)]` [..]on by default
140140
141-
[WARNING] `foo` (bin "foo") generated 1 warning
141+
[WARNING] `foo` (bin "foo") generated 1 warning[..]
142142
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
143143
144144
"#]])
@@ -162,7 +162,7 @@ fn requires_nightly() {
162162
|
163163
= [NOTE] `#[warn(unused_variables)]` [..]on by default
164164
165-
[WARNING] `foo` (bin "foo") generated 1 warning
165+
[WARNING] `foo` (bin "foo") generated 1 warning[..]
166166
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
167167
168168
"#]])

0 commit comments

Comments
 (0)