Skip to content

Commit cb5fd4e

Browse files
Move dead_code related tests to test/ui/dead-code
This helps organize the tests better. I also renamed several of the tests to remove redundant dead-code in the path, and better match what they're testing
1 parent 9f257dd commit cb5fd4e

36 files changed

+18
-18
lines changed

src/test/ui/fail-no-dead-code.stderr renamed to src/test/ui/lint/dead-code/basic.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: function is never used: `foo`
2-
--> $DIR/fail-no-dead-code.rs:4:1
2+
--> $DIR/basic.rs:4:1
33
|
44
LL | fn foo() {
55
| ^^^^^^^^
66
|
77
note: lint level defined here
8-
--> $DIR/fail-no-dead-code.rs:1:9
8+
--> $DIR/basic.rs:1:9
99
|
1010
LL | #![deny(dead_code)]
1111
| ^^^^^^^^^

src/test/ui/lint/lint-dead-code-empty-unused-enum.stderr renamed to src/test/ui/lint/dead-code/empty-unused-enum.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: enum is never used: `E`
2-
--> $DIR/lint-dead-code-empty-unused-enum.rs:3:1
2+
--> $DIR/empty-unused-enum.rs:3:1
33
|
44
LL | enum E {}
55
| ^^^^^^
66
|
77
note: lint level defined here
8-
--> $DIR/lint-dead-code-empty-unused-enum.rs:1:9
8+
--> $DIR/empty-unused-enum.rs:1:9
99
|
1010
LL | #![deny(unused)]
1111
| ^^^^^^

src/test/ui/lint/lint-dead-code-impl-trait.stderr renamed to src/test/ui/lint/dead-code/impl-trait.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: type alias is never used: `Unused`
2-
--> $DIR/lint-dead-code-impl-trait.rs:12:1
2+
--> $DIR/impl-trait.rs:12:1
33
|
44
LL | type Unused = ();
55
| ^^^^^^^^^^^^^^^^^
66
|
77
note: lint level defined here
8-
--> $DIR/lint-dead-code-impl-trait.rs:1:9
8+
--> $DIR/impl-trait.rs:1:9
99
|
1010
LL | #![deny(dead_code)]
1111
| ^^^^^^^^^

src/test/ui/lint/lint-dead-code-type-alias.stderr renamed to src/test/ui/lint/dead-code/type-alias.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: type alias is never used: `Unused`
2-
--> $DIR/lint-dead-code-type-alias.rs:4:1
2+
--> $DIR/type-alias.rs:4:1
33
|
44
LL | type Unused = u8;
55
| ^^^^^^^^^^^^^^^^^
66
|
77
note: lint level defined here
8-
--> $DIR/lint-dead-code-type-alias.rs:1:9
8+
--> $DIR/type-alias.rs:1:9
99
|
1010
LL | #![deny(dead_code)]
1111
| ^^^^^^^^^

src/test/ui/lint/lint-dead-code-unused-enum.stderr renamed to src/test/ui/lint/dead-code/unused-enum.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
error: struct is never constructed: `F`
2-
--> $DIR/lint-dead-code-unused-enum.rs:3:1
2+
--> $DIR/unused-enum.rs:3:1
33
|
44
LL | struct F;
55
| ^^^^^^^^^
66
|
77
note: lint level defined here
8-
--> $DIR/lint-dead-code-unused-enum.rs:1:9
8+
--> $DIR/unused-enum.rs:1:9
99
|
1010
LL | #![deny(unused)]
1111
| ^^^^^^
1212
= note: `#[deny(dead_code)]` implied by `#[deny(unused)]`
1313

1414
error: struct is never constructed: `B`
15-
--> $DIR/lint-dead-code-unused-enum.rs:4:1
15+
--> $DIR/unused-enum.rs:4:1
1616
|
1717
LL | struct B;
1818
| ^^^^^^^^^
1919

2020
error: enum is never used: `E`
21-
--> $DIR/lint-dead-code-unused-enum.rs:6:1
21+
--> $DIR/unused-enum.rs:6:1
2222
|
2323
LL | enum E {
2424
| ^^^^^^

src/test/ui/lint/lint-dead-code-unused-variant.stderr renamed to src/test/ui/lint/dead-code/unused-struct-variant.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: variant is never constructed: `Bar`
2-
--> $DIR/lint-dead-code-unused-variant.rs:8:5
2+
--> $DIR/unused-struct-variant.rs:8:5
33
|
44
LL | Bar(B),
55
| ^^^^^^
66
|
77
note: lint level defined here
8-
--> $DIR/lint-dead-code-unused-variant.rs:1:9
8+
--> $DIR/unused-struct-variant.rs:1:9
99
|
1010
LL | #![deny(unused)]
1111
| ^^^^^^

src/test/ui/lint/lint-dead-code-variant.stderr renamed to src/test/ui/lint/dead-code/unused-variant.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: variant is never constructed: `Variant1`
2-
--> $DIR/lint-dead-code-variant.rs:5:5
2+
--> $DIR/unused-variant.rs:5:5
33
|
44
LL | Variant1,
55
| ^^^^^^^^
66
|
77
note: lint level defined here
8-
--> $DIR/lint-dead-code-variant.rs:1:9
8+
--> $DIR/unused-variant.rs:1:9
99
|
1010
LL | #![deny(dead_code)]
1111
| ^^^^^^^^^

src/test/ui/fail-no-dead-code-core.stderr renamed to src/test/ui/lint/dead-code/with-core-crate.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: function is never used: `foo`
2-
--> $DIR/fail-no-dead-code-core.rs:7:1
2+
--> $DIR/with-core-crate.rs:7:1
33
|
44
LL | fn foo() {
55
| ^^^^^^^^
66
|
77
note: lint level defined here
8-
--> $DIR/fail-no-dead-code-core.rs:1:9
8+
--> $DIR/with-core-crate.rs:1:9
99
|
1010
LL | #![deny(dead_code)]
1111
| ^^^^^^^^^

0 commit comments

Comments
 (0)