squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Rollup merge of #99036 - TaKO8Ki:fix-test-for-88138, r=compiler-errors

Browse source 
Add `#[test]` to functions in test modules

I implemented a suggestion in #91770, but the ui test I created was inadequate and I have fixed that.
This commit is contained in:
Yuki Okushi 2022-07-17 13:08:49 +09:00 committed by GitHub
parent 48cf43b752 29dc72dd10
commit 0748638cf9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 103 additions and 192 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/test/ui/imports/unused-imports-in-test-mode.rs
View file

@ -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`
}
}

82
src/test/ui/imports/unused-imports-in-test-mode.stderr
View file

@ -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
|
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
|
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:56: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:66: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:76: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:87:13
|
LL | use crate::b;
| ^^^^^^^^
error: aborting due to 19 previous errors
error: unused import: `crate::b`
--> $DIR/unused-imports-in-test-mode.rs:98:13
|
LL | use crate::b;
| ^^^^^^^^
error: aborting due to 10 previous errors

53
src/test/ui/imports/unused-imports-in-test-module.rs
View file

@ -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;
}
}

106
src/test/ui/imports/unused-imports-in-test-module.stderr
View file

@ -22,114 +22,42 @@ help: consider adding a `#[cfg(test)]` to the containing module
LL | mod test {
| ^^^^^^^^
error: unused import: `crate::b`
--> $DIR/unused-imports-in-test-module.rs:12:13
|
LL | use crate::b;
| ^^^^^^^^
|
help: consider adding a `#[cfg(test)]` to the containing module
--> $DIR/unused-imports-in-test-module.rs:8:1
|
LL | mod test {
| ^^^^^^^^
error: unused import: `super::a`
--> $DIR/unused-imports-in-test-module.rs:17:9
--> $DIR/unused-imports-in-test-module.rs:19:9
|
LL | use super::a;
| ^^^^^^^^
|
help: consider adding a `#[cfg(test)]` to the containing module
--> $DIR/unused-imports-in-test-module.rs:16:1
|
LL | mod tests {
| ^^^^^^^^^
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 containing module
--> $DIR/unused-imports-in-test-module.rs:16:1
--> $DIR/unused-imports-in-test-module.rs:18:1
|
LL | mod tests {
| ^^^^^^^^^
error: unused import: `super::a`
--> $DIR/unused-imports-in-test-module.rs:25:9
--> $DIR/unused-imports-in-test-module.rs:29:9
|
LL | use super::a;
| ^^^^^^^^
|
help: consider adding a `#[cfg(test)]` to the containing module
--> $DIR/unused-imports-in-test-module.rs:24:1
|
LL | mod test_a {
| ^^^^^^^^^^
error: unused import: `crate::b`
--> $DIR/unused-imports-in-test-module.rs:28:13
|
LL | use crate::b;
| ^^^^^^^^
|
help: consider adding a `#[cfg(test)]` to the containing module
--> $DIR/unused-imports-in-test-module.rs:24:1
--> $DIR/unused-imports-in-test-module.rs:28:1
|
LL | mod test_a {
| ^^^^^^^^^^
error: unused import: `super::a`
--> $DIR/unused-imports-in-test-module.rs:33:9
--> $DIR/unused-imports-in-test-module.rs:39:9
|
LL | use super::a;
| ^^^^^^^^
|
help: consider adding a `#[cfg(test)]` to the containing module
--> $DIR/unused-imports-in-test-module.rs:32:1
--> $DIR/unused-imports-in-test-module.rs:38:1
|
LL | mod a_test {
| ^^^^^^^^^^
error: unused import: `crate::b`
--> $DIR/unused-imports-in-test-module.rs:36:13
|
LL | use crate::b;
| ^^^^^^^^
|
help: consider adding a `#[cfg(test)]` to the containing module
--> $DIR/unused-imports-in-test-module.rs:32:1
|
LL | mod a_test {
| ^^^^^^^^^^
error: unused import: `super::a`
--> $DIR/unused-imports-in-test-module.rs:41:9
|
LL | use super::a;
| ^^^^^^^^
|
help: consider adding a `#[cfg(test)]` to the containing module
--> $DIR/unused-imports-in-test-module.rs:40:1
|
LL | mod tests_a {
| ^^^^^^^^^^^
error: unused import: `crate::b`
--> $DIR/unused-imports-in-test-module.rs:44:13
|
LL | use crate::b;
| ^^^^^^^^
|
help: consider adding a `#[cfg(test)]` to the containing module
--> $DIR/unused-imports-in-test-module.rs:40:1
|
LL | mod tests_a {
| ^^^^^^^^^^^
error: unused import: `super::a`
--> $DIR/unused-imports-in-test-module.rs:49:9
|
@ -139,32 +67,26 @@ LL | use super::a;
help: consider adding a `#[cfg(test)]` to the containing module
--> $DIR/unused-imports-in-test-module.rs:48:1
|
LL | mod a_tests {
LL | mod tests_a {
| ^^^^^^^^^^^
error: unused import: `crate::b`
--> $DIR/unused-imports-in-test-module.rs:52:13
error: unused import: `super::a`
--> $DIR/unused-imports-in-test-module.rs:59:9
|
LL | use crate::b;
| ^^^^^^^^
LL | use super::a;
| ^^^^^^^^
|
help: 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:58:1
|
LL | mod a_tests {
| ^^^^^^^^^^^
error: unused import: `super::a`
--> $DIR/unused-imports-in-test-module.rs:57:9
--> $DIR/unused-imports-in-test-module.rs:69:9
|
LL | use super::a;
| ^^^^^^^^
error: unused import: `crate::b`
--> $DIR/unused-imports-in-test-module.rs:60:13
|
LL | use crate::b;
| ^^^^^^^^
error: aborting due to 15 previous errors
error: aborting due to 8 previous errors