Skip to content

Commit c0fccf5

Browse files
authored
Rollup merge of #66469 - CosineP:fix/field-lint, r=petrochenkov
Use "field is never read" instead of "field is never used" this is my first PR here so please let me know if i am doing it wrong closes #64465 i will be referencing this with a book PR that updates the same language
2 parents 937195b + bd63c59 commit c0fccf5

File tree

7 files changed

+21
-21
lines changed

7 files changed

+21
-21
lines changed

src/librustc_passes/dead.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ impl Visitor<'tcx> for DeadVisitor<'tcx> {
631631

632632
fn visit_struct_field(&mut self, field: &'tcx hir::StructField) {
633633
if self.should_warn_about_field(&field) {
634-
self.warn_dead_code(field.hir_id, field.span, field.ident.name, "field", "used");
634+
self.warn_dead_code(field.hir_id, field.span, field.ident.name, "field", "read");
635635
}
636636
intravisit::walk_struct_field(self, field);
637637
}

src/test/ui/lint/dead-code/lint-dead-code-4.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
struct Foo {
66
x: usize,
7-
b: bool, //~ ERROR: field is never used
7+
b: bool, //~ ERROR: field is never read
88
}
99

1010
fn field_read(f: Foo) -> usize {
@@ -36,8 +36,8 @@ enum IJK {
3636
I, //~ ERROR variant is never constructed
3737
J {
3838
a: String,
39-
b: i32, //~ ERROR field is never used
40-
c: i32, //~ ERROR field is never used
39+
b: i32, //~ ERROR field is never read
40+
c: i32, //~ ERROR field is never read
4141
},
4242
K //~ ERROR variant is never constructed
4343

@@ -58,9 +58,9 @@ fn field_match_in_patterns(b: XYZ) -> String {
5858
}
5959

6060
struct Bar {
61-
x: usize, //~ ERROR: field is never used
61+
x: usize, //~ ERROR: field is never read
6262
b: bool,
63-
c: bool, //~ ERROR: field is never used
63+
c: bool, //~ ERROR: field is never read
6464
_guard: ()
6565
}
6666

src/test/ui/lint/dead-code/lint-dead-code-4.stderr

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error: field is never used: `b`
1+
error: field is never read: `b`
22
--> $DIR/lint-dead-code-4.rs:7:5
33
|
44
LL | b: bool,
@@ -38,13 +38,13 @@ error: variant is never constructed: `I`
3838
LL | I,
3939
| ^
4040

41-
error: field is never used: `b`
41+
error: field is never read: `b`
4242
--> $DIR/lint-dead-code-4.rs:39:9
4343
|
4444
LL | b: i32,
4545
| ^^^^^^
4646

47-
error: field is never used: `c`
47+
error: field is never read: `c`
4848
--> $DIR/lint-dead-code-4.rs:40:9
4949
|
5050
LL | c: i32,
@@ -56,13 +56,13 @@ error: variant is never constructed: `K`
5656
LL | K
5757
| ^
5858

59-
error: field is never used: `x`
59+
error: field is never read: `x`
6060
--> $DIR/lint-dead-code-4.rs:61:5
6161
|
6262
LL | x: usize,
6363
| ^^^^^^^^
6464

65-
error: field is never used: `c`
65+
error: field is never read: `c`
6666
--> $DIR/lint-dead-code-4.rs:63:5
6767
|
6868
LL | c: bool,

src/test/ui/union/union-fields-1.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
union U1 {
44
a: u8, // should not be reported
55
b: u8, // should not be reported
6-
c: u8, //~ ERROR field is never used
6+
c: u8, //~ ERROR field is never read
77
}
88
union U2 {
9-
a: u8, //~ ERROR field is never used
9+
a: u8, //~ ERROR field is never read
1010
b: u8, // should not be reported
1111
c: u8, // should not be reported
1212
}
13-
union NoDropLike { a: u8 } //~ ERROR field is never used
13+
union NoDropLike { a: u8 } //~ ERROR field is never read
1414

1515
union U {
1616
a: u8, // should not be reported
1717
b: u8, // should not be reported
18-
c: u8, //~ ERROR field is never used
18+
c: u8, //~ ERROR field is never read
1919
}
2020
type A = U;
2121

src/test/ui/union/union-fields-1.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error: field is never used: `c`
1+
error: field is never read: `c`
22
--> $DIR/union-fields-1.rs:6:5
33
|
44
LL | c: u8,
@@ -10,19 +10,19 @@ note: lint level defined here
1010
LL | #![deny(dead_code)]
1111
| ^^^^^^^^^
1212

13-
error: field is never used: `a`
13+
error: field is never read: `a`
1414
--> $DIR/union-fields-1.rs:9:5
1515
|
1616
LL | a: u8,
1717
| ^^^^^
1818

19-
error: field is never used: `a`
19+
error: field is never read: `a`
2020
--> $DIR/union-fields-1.rs:13:20
2121
|
2222
LL | union NoDropLike { a: u8 }
2323
| ^^^^^
2424

25-
error: field is never used: `c`
25+
error: field is never read: `c`
2626
--> $DIR/union-fields-1.rs:18:5
2727
|
2828
LL | c: u8,

src/test/ui/union/union-lint-dead-code.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
union Foo {
44
x: usize,
5-
b: bool, //~ ERROR: field is never used
5+
b: bool, //~ ERROR: field is never read
66
_unused: u16,
77
}
88

src/test/ui/union/union-lint-dead-code.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error: field is never used: `b`
1+
error: field is never read: `b`
22
--> $DIR/union-lint-dead-code.rs:5:5
33
|
44
LL | b: bool,

0 commit comments

Comments
 (0)