use contains("test")

Author: TaKO8Ki

compiler/rustc_lint/src/context.rs

@@ -681,7 +681,7 @@ pub trait LintContext: Sized {
                         let def_span = self.sess().source_map().guess_head_span(span);
                         db.span_help(
                             span.shrink_to_lo().to(def_span),
-                            "consider adding a `#[cfg(test)]` to the module named `test` in which this import is",
+                            "consider adding a `#[cfg(test)]` to the parent module",
                         );
                     }
                 }

compiler/rustc_resolve/src/check_unused.rs

@@ -320,7 +320,7 @@ impl Resolver<'_> {
                 visitor.r.local_def_id(unused.use_tree_id).to_def_id(),
             );
             let test_module_span = match module_to_string(parent_module) {
-                Some(module) if module == "test" => Some(parent_module.span),
+                Some(module) if module.contains("test") => Some(parent_module.span),
                 _ => None,
             };
 

src/test/ui/imports/unused-imports-in-test-module.rs

@@ -13,4 +13,12 @@ mod test {
     }
 }
 
+mod test_a {
+    use super::a;  //~ ERROR unused import: `super::a`
+
+    fn foo() {
+        use crate::b;  //~ ERROR unused import: `crate::b`
+    }
+}
+
 fn main() {}

src/test/ui/imports/unused-imports-in-test-module.stderr

@@ -16,7 +16,7 @@ error: unused import: `super::a`
 LL |     use super::a;
    |         ^^^^^^^^
    |
-help: consider adding a `#[cfg(test)]` to the module named `test` in which this import is
+help: consider adding a `#[cfg(test)]` to the parent module
   --> $DIR/unused-imports-in-test-module.rs:8:1
    |
 LL | mod test {
@@ -28,11 +28,35 @@ error: unused import: `crate::b`
 LL |         use crate::b;
    |             ^^^^^^^^
    |
-help: consider adding a `#[cfg(test)]` to the module named `test` in which this import is
+help: consider adding a `#[cfg(test)]` to the parent module
   --> $DIR/unused-imports-in-test-module.rs:8:1
    |
 LL | mod test {
    | ^^^^^^^^
 
-error: aborting due to 3 previous errors
+error: unused import: `super::a`
+  --> $DIR/unused-imports-in-test-module.rs:17:9
+   |
+LL |     use super::a;
+   |         ^^^^^^^^
+   |
+help: consider adding a `#[cfg(test)]` to the parent module
+  --> $DIR/unused-imports-in-test-module.rs:16:1
+   |
+LL | mod test_a {
+   | ^^^^^^^^^^
+
+error: unused import: `crate::b`
+  --> $DIR/unused-imports-in-test-module.rs:20:13
+   |
+LL |         use crate::b;
+   |             ^^^^^^^^
+   |
+help: consider adding a `#[cfg(test)]` to the parent module
+  --> $DIR/unused-imports-in-test-module.rs:16:1
+   |
+LL | mod test_a {
+   | ^^^^^^^^^^
+
+error: aborting due to 5 previous errors