Rollup merge of rust-lang#99036 - TaKO8Ki:fix-test-for-88138, r=compi…

…ler-errors Add `#[test]` to functions in test modules I implemented a suggestion in rust-lang#91770, but the ui test I created was inadequate and I have fixed that.
JohnTitor · Jul 17, 2022 · 0748638 · 0748638
2 parents 48cf43b + 29dc72d
commit 0748638
Show file tree

Hide file tree

Showing 4 changed files with 97 additions and 186 deletions.
diff --git a/src/test/ui/imports/unused-imports-in-test-mode.rs b/src/test/ui/imports/unused-imports-in-test-mode.rs
@@ -8,76 +8,94 @@ fn a() {}
 fn b() {}
 
 mod test {
-    use super::a;  //~ ERROR unused import: `super::a`
+    use super::a;
 
+    #[test]
     fn foo() {
-        use crate::b;  //~ ERROR unused import: `crate::b`
+        a();
+        use crate::b; //~ ERROR unused import: `crate::b`
     }
 }
 
 mod tests {
-    use super::a;  //~ ERROR unused import: `super::a`
+    use super::a;
 
+    #[test]
     fn foo() {
-        use crate::b;  //~ ERROR unused import: `crate::b`
+        a();
+        use crate::b; //~ ERROR unused import: `crate::b`
     }
 }
 
 mod test_a {
-    use super::a;  //~ ERROR unused import: `super::a`
+    use super::a;
 
+    #[test]
     fn foo() {
-        use crate::b;  //~ ERROR unused import: `crate::b`
+        a();
+        use crate::b; //~ ERROR unused import: `crate::b`
     }
 }
 
 mod a_test {
-    use super::a;  //~ ERROR unused import: `super::a`
+    use super::a;
 
+    #[test]
     fn foo() {
-        use crate::b;  //~ ERROR unused import: `crate::b`
+        a();
+        use crate::b; //~ ERROR unused import: `crate::b`
     }
 }
 
 mod tests_a {
-    use super::a;  //~ ERROR unused import: `super::a`
+    use super::a;
 
+    #[test]
     fn foo() {
-        use crate::b;  //~ ERROR unused import: `crate::b`
+        a();
+        use crate::b; //~ ERROR unused import: `crate::b`
     }
 }
 
 mod a_tests {
-    use super::a;  //~ ERROR unused import: `super::a`
+    use super::a;
 
+    #[test]
     fn foo() {
-        use crate::b;  //~ ERROR unused import: `crate::b`
+        a();
+        use crate::b; //~ ERROR unused import: `crate::b`
     }
 }
 
 mod fastest_search {
-    use super::a;  //~ ERROR unused import: `super::a`
+    use super::a;
 
+    #[test]
     fn foo() {
-        use crate::b;  //~ ERROR unused import: `crate::b`
+        a();
+        use crate::b; //~ ERROR unused import: `crate::b`
     }
 }
 
 #[cfg(test)]
 mod test_has_attr {
-    use super::a;  //~ ERROR unused import: `super::a`
+    use super::a;
 
+    #[test]
     fn foo() {
-        use crate::b;  //~ ERROR unused import: `crate::b`
+        a();
+        use crate::b; //~ ERROR unused import: `crate::b`
     }
 }
 
 mod test_has_no_attr {
     #[cfg(test)]
-    use super::a;  //~ ERROR unused import: `super::a`
+    use super::a;
 
+    #[test]
     fn foo() {
-        use crate::b;  //~ ERROR unused import: `crate::b`
+        a();
+        use crate::b; //~ ERROR unused import: `crate::b`
     }
 }
 

diff --git a/src/test/ui/imports/unused-imports-in-test-mode.stderr b/src/test/ui/imports/unused-imports-in-test-mode.stderr
@@ -10,113 +10,59 @@ note: the lint level is defined here
 LL | #![deny(unused_imports)]
    |         ^^^^^^^^^^^^^^
 
-error: unused import: `super::a`
-  --> $DIR/unused-imports-in-test-mode.rs:11:9
-   |
-LL |     use super::a;
-   |         ^^^^^^^^
-
 error: unused import: `crate::b`
-  --> $DIR/unused-imports-in-test-mode.rs:14:13
+  --> $DIR/unused-imports-in-test-mode.rs:16:13
    |
 LL |         use crate::b;
    |             ^^^^^^^^
 
-error: unused import: `super::a`
-  --> $DIR/unused-imports-in-test-mode.rs:19:9
-   |
-LL |     use super::a;
-   |         ^^^^^^^^
-
 error: unused import: `crate::b`
-  --> $DIR/unused-imports-in-test-mode.rs:22:13
+  --> $DIR/unused-imports-in-test-mode.rs:26:13
    |
 LL |         use crate::b;
    |             ^^^^^^^^
 
-error: unused import: `super::a`
-  --> $DIR/unused-imports-in-test-mode.rs:27:9
-   |
-LL |     use super::a;
-   |         ^^^^^^^^
-
 error: unused import: `crate::b`
-  --> $DIR/unused-imports-in-test-mode.rs:30:13
+  --> $DIR/unused-imports-in-test-mode.rs:36:13
    |
 LL |         use crate::b;
    |             ^^^^^^^^
 
-error: unused import: `super::a`
-  --> $DIR/unused-imports-in-test-mode.rs:35:9
-   |
-LL |     use super::a;
-   |         ^^^^^^^^
-
 error: unused import: `crate::b`
-  --> $DIR/unused-imports-in-test-mode.rs:38:13
+  --> $DIR/unused-imports-in-test-mode.rs:46:13
    |
 LL |         use crate::b;
    |             ^^^^^^^^
 
-error: unused import: `super::a`
-  --> $DIR/unused-imports-in-test-mode.rs:43:9
-   |
-LL |     use super::a;
-   |         ^^^^^^^^
-
 error: unused import: `crate::b`
-  --> $DIR/unused-imports-in-test-mode.rs:46:13
+  --> $DIR/unused-imports-in-test-mode.rs:56:13
    |
 LL |         use crate::b;
    |             ^^^^^^^^
 
-error: unused import: `super::a`
-  --> $DIR/unused-imports-in-test-mode.rs:51:9
-   |
-LL |     use super::a;
-   |         ^^^^^^^^
-
 error: unused import: `crate::b`
-  --> $DIR/unused-imports-in-test-mode.rs:54:13
+  --> $DIR/unused-imports-in-test-mode.rs:66:13
    |
 LL |         use crate::b;
    |             ^^^^^^^^
 
-error: unused import: `super::a`
-  --> $DIR/unused-imports-in-test-mode.rs:59:9
-   |
-LL |     use super::a;
-   |         ^^^^^^^^
-
 error: unused import: `crate::b`
-  --> $DIR/unused-imports-in-test-mode.rs:62:13
+  --> $DIR/unused-imports-in-test-mode.rs:76:13
    |
 LL |         use crate::b;
    |             ^^^^^^^^
 
-error: unused import: `super::a`
-  --> $DIR/unused-imports-in-test-mode.rs:68:9
-   |
-LL |     use super::a;
-   |         ^^^^^^^^
-
 error: unused import: `crate::b`
-  --> $DIR/unused-imports-in-test-mode.rs:71:13
+  --> $DIR/unused-imports-in-test-mode.rs:87:13
    |
 LL |         use crate::b;
    |             ^^^^^^^^
 
-error: unused import: `super::a`
-  --> $DIR/unused-imports-in-test-mode.rs:77:9
-   |
-LL |     use super::a;
-   |         ^^^^^^^^
-
 error: unused import: `crate::b`
-  --> $DIR/unused-imports-in-test-mode.rs:80:13
+  --> $DIR/unused-imports-in-test-mode.rs:98:13
    |
 LL |         use crate::b;
    |             ^^^^^^^^
 
-error: aborting due to 19 previous errors
+error: aborting due to 10 previous errors
 
diff --git a/src/test/ui/imports/unused-imports-in-test-module.rs b/src/test/ui/imports/unused-imports-in-test-module.rs
@@ -6,58 +6,83 @@ fn a() {}
 fn b() {}
 
 mod test {
-    use super::a;  //~ ERROR unused import: `super::a`
+    use super::a; //~ ERROR unused import: `super::a`
 
+    #[test]
     fn foo() {
-        use crate::b;  //~ ERROR unused import: `crate::b`
+        a();
+        use crate::b;
     }
 }
 
 mod tests {
-    use super::a;  //~ ERROR unused import: `super::a`
+    use super::a; //~ ERROR unused import: `super::a`
 
+    #[test]
     fn foo() {
-        use crate::b;  //~ ERROR unused import: `crate::b`
+        a();
+        use crate::b;
     }
 }
 
 mod test_a {
-    use super::a;  //~ ERROR unused import: `super::a`
+    use super::a; //~ ERROR unused import: `super::a`
 
+    #[test]
     fn foo() {
-        use crate::b;  //~ ERROR unused import: `crate::b`
+        a();
+        use crate::b;
     }
 }
 
 mod a_test {
-    use super::a;  //~ ERROR unused import: `super::a`
+    use super::a; //~ ERROR unused import: `super::a`
 
+    #[test]
     fn foo() {
-        use crate::b;  //~ ERROR unused import: `crate::b`
+        a();
+        use crate::b;
     }
 }
 
 mod tests_a {
-    use super::a;  //~ ERROR unused import: `super::a`
+    use super::a; //~ ERROR unused import: `super::a`
 
+    #[test]
     fn foo() {
-        use crate::b;  //~ ERROR unused import: `crate::b`
+        a();
+        use crate::b;
     }
 }
 
 mod a_tests {
-    use super::a;  //~ ERROR unused import: `super::a`
+    use super::a; //~ ERROR unused import: `super::a`
 
+    #[test]
     fn foo() {
-        use crate::b;  //~ ERROR unused import: `crate::b`
+        a();
+        use crate::b;
     }
 }
 
 mod fastest_search {
-    use super::a;  //~ ERROR unused import: `super::a`
+    use super::a; //~ ERROR unused import: `super::a`
 
+    #[test]
     fn foo() {
-        use crate::b;  //~ ERROR unused import: `crate::b`
+        a();
+        use crate::b;
+    }
+}
+
+#[cfg(test)]
+mod test_has_attr {
+    use super::a;
+
+    #[test]
+    fn foo() {
+        a();
+        use crate::b;
     }
 }