nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-28 02:57:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix union unused fields check

Browse Source
This commit is contained in:
Guillaume Gomez 2017-08-06 18:49:33 +02:00
parent 90f54d00d3
commit 09420fc206
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/librustc/middle/dead.rs
View File

@ -190,20 +190,18 @@ impl<'a, 'tcx> MarkSymbolVisitor<'a, 'tcx> {
self.inherited_pub_visibility = had_inherited_pub_visibility;
}
fn mark_as_used_if_union(&mut self, did: DefId) {
fn mark_as_used_if_union(&mut self, did: DefId, fields: &hir::HirVec<hir::Field>) {
if let Some(node_id) = self.tcx.hir.as_local_node_id(did) {
match self.tcx.hir.find(node_id) {
Some(hir_map::NodeItem(item)) => match item.node {
Item_::ItemUnion(ref variant, _) => {
if variant.fields().len() > 1 {
for field in variant.fields() {
if let Some(hir_map::NodeItem(item)) = self.tcx.hir.find(node_id) {
if let Item_::ItemUnion(ref variant, _) = item.node {
if variant.fields().len() > 1 {
for field in variant.fields() {
if fields.iter().find(|x| x.name.node == field.name).is_some() {
self.live_symbols.insert(field.id);
}
}
}
_ => {}
},
_ => {}
}
}
}
}
@ -239,11 +237,6 @@ impl<'a, 'tcx> Visitor<'tcx> for MarkSymbolVisitor<'a, 'tcx> {
hir::ExprPath(ref qpath @ hir::QPath::TypeRelative(..)) => {
let def = self.tables.qpath_def(qpath, expr.id);
self.handle_definition(def);
self.mark_as_used_if_union(def.def_id());
}
hir::ExprPath(ref qpath @ hir::QPath::Resolved(..)) => {
let def = self.tables.qpath_def(qpath, expr.id);
self.mark_as_used_if_union(def.def_id());
}
hir::ExprMethodCall(..) => {
self.lookup_and_handle_method(expr.id);
@ -254,6 +247,10 @@ impl<'a, 'tcx> Visitor<'tcx> for MarkSymbolVisitor<'a, 'tcx> {
hir::ExprTupField(ref lhs, idx) => {
self.handle_tup_field_access(&lhs, idx.node);
}
hir::ExprStruct(ref qpath, ref fields, _) => {
let def = self.tables.qpath_def(qpath, expr.id);
self.mark_as_used_if_union(def.def_id(), fields);
}
_ => ()
}

22
src/test/ui/union-fields.stderr
View File

@ -1,8 +1,8 @@
error: field is never used: `y`
--> $DIR/union-fields.rs:20:5
error: field is never used: `c`
--> $DIR/union-fields.rs:16:5
|
20 | y: u32,
| ^^^^^^
16 | c: u8, // should be reported
| ^^^^^
|
note: lint level defined here
--> $DIR/union-fields.rs:11:9
@ -10,5 +10,17 @@ note: lint level defined here
11 | #![deny(dead_code)]
| ^^^^^^^^^
error: aborting due to previous error
error: field is never used: `a`
--> $DIR/union-fields.rs:19:5
|
19 | a: u8, // should be reported
| ^^^^^
error: field is never used: `a`
--> $DIR/union-fields.rs:23:20
|
23 | union NoDropLike { a: u8 } // should be reported as unused
| ^^^^^
error: aborting due to 3 previous errors