diff --git a/src/librustc/middle/dead.rs b/src/librustc/middle/dead.rs index 0b1d9e8d8f69..80d45def960d 100644 --- a/src/librustc/middle/dead.rs +++ b/src/librustc/middle/dead.rs @@ -548,7 +548,7 @@ impl<'a, 'tcx, 'v> Visitor<'v> for DeadVisitor<'a, 'tcx> { fn visit_struct_field(&mut self, field: &hir::StructField) { if self.should_warn_about_field(&field) { self.warn_dead_code(field.id, field.span, - field.name, "struct field"); + field.name, "field"); } intravisit::walk_struct_field(self, field); diff --git a/src/test/compile-fail/lint-dead-code-4.rs b/src/test/compile-fail/lint-dead-code-4.rs index 20cd13c1875d..3df089fc2004 100644 --- a/src/test/compile-fail/lint-dead-code-4.rs +++ b/src/test/compile-fail/lint-dead-code-4.rs @@ -14,7 +14,7 @@ struct Foo { x: usize, - b: bool, //~ ERROR: struct field is never used + b: bool, //~ ERROR: field is never used } fn field_read(f: Foo) -> usize { @@ -46,8 +46,8 @@ enum IJK { I, //~ ERROR variant is never used J { a: String, - b: i32, //~ ERROR struct field is never used - c: i32, //~ ERROR struct field is never used + b: i32, //~ ERROR field is never used + c: i32, //~ ERROR field is never used }, K //~ ERROR variant is never used @@ -68,9 +68,9 @@ fn field_match_in_patterns(b: XYZ) -> String { } struct Bar { - x: usize, //~ ERROR: struct field is never used + x: usize, //~ ERROR: field is never used b: bool, - c: bool, //~ ERROR: struct field is never used + c: bool, //~ ERROR: field is never used _guard: () }