mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #121580 - Suyashtnt:issue-121502-fix, r=michaelwoerister

Browse source 
make unused_imports less assertive in test modules

closes #121502

This is a fairly small change and I used the fix suggested in the example expected error message.
Not sure if I should've rather used the alternatives but this one seems the most descriptive.

Some alternatives:
- if this is meant to be a test module, add `#[cfg(test)]` to the containing module
- try adding #[cfg(test)] to this test module
- consider adding #[allow(unused_imports)] if you want to silent the lint on the unused import
- consider removing the unused import
This commit is contained in:
Matthias Krüger 2024-03-01 17:51:29 +01:00 • committed by GitHub
commit 58825b4ea9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_lint/src/context/diagnostics.rs
View file

@ -104,7 +104,7 @@ pub(super) fn builtin(sess: &Session, diagnostic: BuiltinLintDiagnostics, diag:
if let Some(span) = in_test_module { if let Some(span) = in_test_module {
diag.span_help( diag.span_help(
sess.source_map().guess_head_span(span), sess.source_map().guess_head_span(span),
"consider adding a `#[cfg(test)]` to the containing module", "if this is a test module, consider adding a `#[cfg(test)]` to the containing module",
); );
} }
} }

12
tests/ui/imports/unused-imports-in-test-module.stderr
View file

@ -16,7 +16,7 @@ error: unused import: `super::a`
LL | use super::a; LL | use super::a;
| ^^^^^^^^ | ^^^^^^^^
| |
help: consider adding a `#[cfg(test)]` to the containing module help: if this is a test module, consider adding a `#[cfg(test)]` to the containing module
--> $DIR/unused-imports-in-test-module.rs:8:1 --> $DIR/unused-imports-in-test-module.rs:8:1
| |
LL | mod test { LL | mod test {
@ -28,7 +28,7 @@ error: unused import: `super::a`
LL | use super::a; LL | use super::a;
| ^^^^^^^^ | ^^^^^^^^
| |
help: consider adding a `#[cfg(test)]` to the containing module help: if this is a test module, consider adding a `#[cfg(test)]` to the containing module
--> $DIR/unused-imports-in-test-module.rs:18:1 --> $DIR/unused-imports-in-test-module.rs:18:1
| |
LL | mod tests { LL | mod tests {
@ -40,7 +40,7 @@ error: unused import: `super::a`
LL | use super::a; LL | use super::a;
| ^^^^^^^^ | ^^^^^^^^
| |
help: consider adding a `#[cfg(test)]` to the containing module help: if this is a test module, consider adding a `#[cfg(test)]` to the containing module
--> $DIR/unused-imports-in-test-module.rs:28:1 --> $DIR/unused-imports-in-test-module.rs:28:1
| |
LL | mod test_a { LL | mod test_a {
@ -52,7 +52,7 @@ error: unused import: `super::a`
LL | use super::a; LL | use super::a;
| ^^^^^^^^ | ^^^^^^^^
| |
help: consider adding a `#[cfg(test)]` to the containing module help: if this is a test module, consider adding a `#[cfg(test)]` to the containing module
--> $DIR/unused-imports-in-test-module.rs:38:1 --> $DIR/unused-imports-in-test-module.rs:38:1
| |
LL | mod a_test { LL | mod a_test {
@ -64,7 +64,7 @@ error: unused import: `super::a`
LL | use super::a; LL | use super::a;
| ^^^^^^^^ | ^^^^^^^^
| |
help: consider adding a `#[cfg(test)]` to the containing module help: if this is a test module, consider adding a `#[cfg(test)]` to the containing module
--> $DIR/unused-imports-in-test-module.rs:48:1 --> $DIR/unused-imports-in-test-module.rs:48:1
| |
LL | mod tests_a { LL | mod tests_a {
@ -76,7 +76,7 @@ error: unused import: `super::a`
LL | use super::a; LL | use super::a;
| ^^^^^^^^ | ^^^^^^^^
| |
help: consider adding a `#[cfg(test)]` to the containing module help: if this is a test module, consider adding a `#[cfg(test)]` to the containing module
--> $DIR/unused-imports-in-test-module.rs:58:1 --> $DIR/unused-imports-in-test-module.rs:58:1
| |
LL | mod a_tests { LL | mod a_tests {