---

yaml
---
r: 88644
b: refs/heads/snap-stage3
c: 7b42497
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: deeca5d586bfaa4aa60246f671a8d611d38f6248
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: e3b168dab34b7fc765aebda301e4a0aeaf556f67
+refs/heads/snap-stage3: 7b424974531b0ade62e6a26cce038abf5dac0723
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/dead.rs

@@ -107,6 +107,8 @@ impl MarkSymbolVisitor {
                 match item.node {
                     ast::item_fn(..)
                     | ast::item_ty(..)
+                    | ast::item_enum(..)
+                    | ast::item_struct(..)
                     | ast::item_static(..) => {
                         visit::walk_item(self, item, ());
                     }

branches/snap-stage3/src/libsyntax/visit.rs

@@ -290,6 +290,10 @@ pub fn walk_variant<E:Clone, V:Visitor<E>>(visitor:&mut V,
                                      env.clone())
         }
     }
+    match variant.node.disr_expr {
+        Some(expr) => visitor.visit_expr(expr, env),
+        None => ()
+    }
 }
 
 pub fn skip_ty<E, V:Visitor<E>>(_: &mut V, _: &Ty, _: E) {

branches/snap-stage3/src/test/compile-fail/lint-dead-code-1.rs

@@ -27,6 +27,7 @@ static priv_static: int = 0; //~ ERROR: code is never used
 static used_static: int = 0;
 pub static used_static2: int = used_static;
 static USED_STATIC: int = 0;
+static STATIC_USED_IN_ENUM_DISCRIMINANT: uint = 10;
 
 pub type typ = ~UsedStruct4;
 pub struct PubStruct();
@@ -41,8 +42,15 @@ struct SemiUsedStruct;
 impl SemiUsedStruct {
     fn la_la_la() {}
 }
+struct StructUsedAsField;
+struct StructUsedInEnum;
+pub struct PubStruct2 {
+    struct_used_as_field: *StructUsedAsField
+}
 
 pub enum pub_enum { foo1, bar1 }
+pub enum pub_enum2 { a(~StructUsedInEnum) }
+pub enum pub_enum3 { Foo = STATIC_USED_IN_ENUM_DISCRIMINANT }
 enum priv_enum { foo2, bar2 } //~ ERROR: code is never used
 enum used_enum { foo3, bar3 }