Auto merge of #31684 - tmiasko:alternate-stack, r=alexcrichton

[rust.git] / src / librustc / middle / dead.rs

diff --git a/src/librustc/middle/dead.rs b/src/librustc/middle/dead.rs
index 1fa4093853b8199d10867094ac86307bc1c0609c..92372870cd16e0d2f8ae7b4df59b4f6ae3355eb7 100644 (file)
--- a/src/librustc/middle/dead.rs
+++ b/src/librustc/middle/dead.rs
@@ -14,7 +14,7 @@
 
 use dep_graph::DepNode;
 use front::map as ast_map;
-use rustc_front::hir;
+use rustc_front::hir::{self, PatKind};
 use rustc_front::intravisit::{self, Visitor};
 
 use middle::{pat_util, privacy, ty};
@@ -143,7 +143,7 @@ fn handle_field_pattern_match(&mut self, lhs: &hir::Pat,
             _ => self.tcx.sess.span_bug(lhs.span, "non-ADT in struct pattern")
         };
         for pat in pats {
-            if let hir::PatWild = pat.node.pat.node {
+            if let PatKind::Wild = pat.node.pat.node {
                 continue;
             }
             self.insert_def_id(variant.field_named(pat.node.name).did);
@@ -183,17 +183,17 @@ fn visit_node(&mut self, node: &ast_map::Node) {
                                 .contains(&attr::ReprExtern)
                         });
 
-                        intravisit::walk_item(self, &*item);
+                        intravisit::walk_item(self, &item);
                     }
                     hir::ItemEnum(..) => {
                         self.inherited_pub_visibility = item.vis == hir::Public;
-                        intravisit::walk_item(self, &*item);
+                        intravisit::walk_item(self, &item);
                     }
                     hir::ItemFn(..)
                     | hir::ItemTy(..)
                     | hir::ItemStatic(..)
                     | hir::ItemConst(..) => {
-                        intravisit::walk_item(self, &*item);
+                        intravisit::walk_item(self, &item);
                     }
                     _ => ()
                 }
@@ -205,7 +205,7 @@ fn visit_node(&mut self, node: &ast_map::Node) {
                 intravisit::walk_impl_item(self, impl_item);
             }
             ast_map::NodeForeignItem(foreign_item) => {
-                intravisit::walk_foreign_item(self, &*foreign_item);
+                intravisit::walk_foreign_item(self, &foreign_item);
             }
             _ => ()
         }
@@ -237,10 +237,10 @@ fn visit_expr(&mut self, expr: &hir::Expr) {
                 self.lookup_and_handle_method(expr.id);
             }
             hir::ExprField(ref lhs, ref name) => {
-                self.handle_field_access(&**lhs, name.node);
+                self.handle_field_access(&lhs, name.node);
             }
             hir::ExprTupField(ref lhs, idx) => {
-                self.handle_tup_field_access(&**lhs, idx.node);
+                self.handle_tup_field_access(&lhs, idx.node);
             }
             _ => ()
         }
@@ -257,7 +257,7 @@ fn visit_arm(&mut self, arm: &hir::Arm) {
             // necessary for the pattern to match. Those construction sites
             // can't be reached unless the variant is constructed elsewhere.
             let len = self.ignore_variant_stack.len();
-            self.ignore_variant_stack.extend_from_slice(&*variants);
+            self.ignore_variant_stack.extend_from_slice(&variants);
             intravisit::walk_arm(self, arm);
             self.ignore_variant_stack.truncate(len);
         } else {
@@ -268,7 +268,7 @@ fn visit_arm(&mut self, arm: &hir::Arm) {
     fn visit_pat(&mut self, pat: &hir::Pat) {
         let def_map = &self.tcx.def_map;
         match pat.node {
-            hir::PatStruct(_, ref fields, _) => {
+            PatKind::Struct(_, ref fields, _) => {
                 self.handle_field_pattern_match(pat, fields);
             }
             _ if pat_util::pat_is_const(&def_map.borrow(), pat) => {
@@ -435,7 +435,7 @@ fn should_warn_about_field(&mut self, node: &hir::StructField_) -> bool {
         let is_named = node.name().is_some();
         let field_type = self.tcx.node_id_to_type(node.id);
         let is_marker_field = match field_type.ty_to_def_id() {
-            Some(def_id) => self.tcx.lang_items.items().any(|(_, item)| *item == Some(def_id)),
+            Some(def_id) => self.tcx.lang_items.items().iter().any(|item| *item == Some(def_id)),
             _ => false
         };
         is_named