DeclKind

csmoe · oli-obk · commit 14893ba96b64 · 2018-07-16T15:09:16.000+02:00
diff --git a/src/librustc/cfg/construct.rs b/src/librustc/cfg/construct.rs
@@ -126,12 +126,12 @@ impl<'a, 'tcx> CFGBuilder<'a, 'tcx> {
 
     fn decl(&mut self, decl: &hir::Decl, pred: CFGIndex) -> CFGIndex {
         match decl.node {
-            hir::DeclLocal(ref local) => {
+            hir::DeclKind::Local(ref local) => {
                 let init_exit = self.opt_expr(&local.init, pred);
                 self.pat(&local.pat, init_exit)
             }
 
-            hir::DeclItem(_) => pred,
+            hir::DeclKind::Item(_) => pred,
         }
     }
 
diff --git a/src/librustc/hir/intravisit.rs b/src/librustc/hir/intravisit.rs
@@ -949,8 +949,8 @@ pub fn walk_stmt<'v, V: Visitor<'v>>(visitor: &mut V, statement: &'v Stmt) {
 
 pub fn walk_decl<'v, V: Visitor<'v>>(visitor: &mut V, declaration: &'v Decl) {
     match declaration.node {
-        DeclLocal(ref local) => visitor.visit_local(local),
-        DeclItem(item) => visitor.visit_nested_item(item),
+        DeclKind::Local(ref local) => visitor.visit_local(local),
+        DeclKind::Item(item) => visitor.visit_nested_item(item),
     }
 }
 
diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs
@@ -4248,7 +4248,7 @@ impl<'a> LoweringContext<'a> {
             StmtKind::Local(ref l) => Spanned {
                 node: hir::StmtKind::Decl(
                     P(Spanned {
-                        node: hir::DeclLocal(self.lower_local(l)),
+                        node: hir::DeclKind::Local(self.lower_local(l)),
                         span: s.span,
                     }),
                     self.lower_node_id(s.id).node_id,
@@ -4263,7 +4263,7 @@ impl<'a> LoweringContext<'a> {
                     .map(|item_id| Spanned {
                         node: hir::StmtKind::Decl(
                             P(Spanned {
-                                node: hir::DeclItem(item_id),
+                                node: hir::DeclKind::Item(item_id),
                                 span: s.span,
                             }),
                             id.take()
@@ -4493,7 +4493,7 @@ impl<'a> LoweringContext<'a> {
             attrs: ThinVec::new(),
             source,
         });
-        let decl = respan(sp, hir::DeclLocal(local));
+        let decl = respan(sp, hir::DeclKind::Local(local));
         respan(sp, hir::StmtKind::Decl(P(decl), self.next_id().node_id))
     }
 
diff --git a/src/librustc/hir/mod.rs b/src/librustc/hir/mod.rs
@@ -12,8 +12,7 @@
 
 pub use self::BlockCheckMode::*;
 pub use self::CaptureClause::*;
-pub use self::Decl_::*;
-pub use self::Expr_::*;
+pub use self::ExprKind::*;
 pub use self::FunctionRetTy::*;
 pub use self::ForeignItem_::*;
 pub use self::Item_::*;
@@ -1158,27 +1157,27 @@ pub struct Local {
     pub source: LocalSource,
 }
 
-pub type Decl = Spanned<Decl_>;
+pub type Decl = Spanned<DeclKind>;
 
 #[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
-pub enum Decl_ {
+pub enum DeclKind {
     /// A local (let) binding:
-    DeclLocal(P<Local>),
+    Local(P<Local>),
     /// An item binding:
-    DeclItem(ItemId),
+    Item(ItemId),
 }
 
-impl Decl_ {
+impl DeclKind {
     pub fn attrs(&self) -> &[Attribute] {
         match *self {
-            DeclLocal(ref l) => &l.attrs,
-            DeclItem(_) => &[]
+            DeclKind::Local(ref l) => &l.attrs,
+            DeclKind::Item(_) => &[]
         }
     }
 
     pub fn is_local(&self) -> bool {
         match *self {
-            Decl_::DeclLocal(_) => true,
+            DeclKind::Local(_) => true,
             _ => false,
         }
     }
diff --git a/src/librustc/hir/print.rs b/src/librustc/hir/print.rs
@@ -1575,7 +1575,7 @@ impl<'a> State<'a> {
     pub fn print_decl(&mut self, decl: &hir::Decl) -> io::Result<()> {
         self.maybe_print_comment(decl.span.lo())?;
         match decl.node {
-            hir::DeclLocal(ref loc) => {
+            hir::DeclKind::Local(ref loc) => {
                 self.space_if_not_bol()?;
                 self.ibox(indent_unit)?;
                 self.word_nbsp("let")?;
@@ -1590,7 +1590,7 @@ impl<'a> State<'a> {
                 }
                 self.end()
             }
-            hir::DeclItem(item) => {
+            hir::DeclKind::Item(item) => {
                 self.ann.nested(self, Nested::Item(item))
             }
         }
@@ -2400,8 +2400,8 @@ fn stmt_ends_with_semi(stmt: &hir::StmtKind) -> bool {
     match *stmt {
         hir::StmtKind::Decl(ref d, _) => {
             match d.node {
-                hir::DeclLocal(_) => true,
-                hir::DeclItem(_) => false,
+                hir::DeclKind::Local(_) => true,
+                hir::DeclKind::Item(_) => false,
             }
         }
         hir::StmtKind::Expr(ref e, _) => {
diff --git a/src/librustc/ich/impls_hir.rs b/src/librustc/ich/impls_hir.rs
@@ -479,10 +479,10 @@ impl_stable_hash_for!(struct hir::Local {
     source
 });
 
-impl_stable_hash_for_spanned!(hir::Decl_);
-impl_stable_hash_for!(enum hir::Decl_ {
-    DeclLocal(local),
-    DeclItem(item_id)
+impl_stable_hash_for_spanned!(hir::DeclKind);
+impl_stable_hash_for!(enum hir::DeclKind {
+    Local(local),
+    Item(item_id)
 });
 
 impl_stable_hash_for!(struct hir::Arm {
diff --git a/src/librustc/middle/expr_use_visitor.rs b/src/librustc/middle/expr_use_visitor.rs
@@ -588,11 +588,11 @@ impl<'a, 'gcx, 'tcx> ExprUseVisitor<'a, 'gcx, 'tcx> {
         match stmt.node {
             hir::StmtKind::Decl(ref decl, _) => {
                 match decl.node {
-                    hir::DeclLocal(ref local) => {
+                    hir::DeclKind::Local(ref local) => {
                         self.walk_local(&local);
                     }
 
-                    hir::DeclItem(_) => {
+                    hir::DeclKind::Item(_) => {
                         // we don't visit nested items in this visitor,
                         // only the fn body we were given.
                     }
diff --git a/src/librustc/middle/liveness.rs b/src/librustc/middle/liveness.rs
@@ -873,10 +873,10 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
     fn propagate_through_decl(&mut self, decl: &hir::Decl, succ: LiveNode)
                               -> LiveNode {
         match decl.node {
-            hir::DeclLocal(ref local) => {
+            hir::DeclKind::Local(ref local) => {
                 self.propagate_through_local(&local, succ)
             }
-            hir::DeclItem(_) => succ,
+            hir::DeclKind::Item(_) => succ,
         }
     }
 
diff --git a/src/librustc_mir/hair/cx/block.rs b/src/librustc_mir/hair/cx/block.rs
@@ -67,10 +67,10 @@ fn mirror_stmts<'a, 'gcx, 'tcx>(cx: &mut Cx<'a, 'gcx, 'tcx>,
             }
             hir::StmtKind::Decl(ref decl, _) => {
                 match decl.node {
-                    hir::DeclItem(..) => {
+                    hir::DeclKind::Item(..) => {
                         // ignore for purposes of the MIR
                     }
-                    hir::DeclLocal(ref local) => {
+                    hir::DeclKind::Local(ref local) => {
                         let remainder_scope = region::Scope::Remainder(BlockRemainder {
                             block: block_id,
                             first_statement_index: region::FirstStatementIndex::new(index),
diff --git a/src/librustc_passes/rvalue_promotion.rs b/src/librustc_passes/rvalue_promotion.rs
@@ -263,7 +263,7 @@ impl<'a, 'tcx> CheckCrateVisitor<'a, 'tcx> {
         match stmt.node {
             hir::StmtKind::Decl(ref decl, _node_id) => {
                 match &decl.node {
-                    hir::DeclLocal(local) => {
+                    hir::DeclKind::Local(local) => {
                         if self.remove_mut_rvalue_borrow(&local.pat) {
                             if let Some(init) = &local.init {
                                 self.mut_rvalue_borrows.insert(init.id);
@@ -277,7 +277,7 @@ impl<'a, 'tcx> CheckCrateVisitor<'a, 'tcx> {
                         NotPromotable
                     }
                     // Item statements are allowed
-                    hir::DeclItem(_) => Promotable
+                    hir::DeclKind::Item(_) => Promotable
                 }
             }
             hir::StmtKind::Expr(ref box_expr, _node_id) |
diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
@@ -4379,8 +4379,8 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
         match stmt.node {
             hir::StmtKind::Decl(ref decl, _) => {
                 match decl.node {
-                    hir::DeclLocal(_) => {}
-                    hir::DeclItem(_) => {
+                    hir::DeclKind::Local(_) => {}
+                    hir::DeclKind::Item(_) => {
                         return;
                     }
                 }
@@ -4399,10 +4399,10 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
         match stmt.node {
             hir::StmtKind::Decl(ref decl, _) => {
                 match decl.node {
-                    hir::DeclLocal(ref l) => {
+                    hir::DeclKind::Local(ref l) => {
                         self.check_decl_local(&l);
                     }
-                    hir::DeclItem(_) => {/* ignore for now */}
+                    hir::DeclKind::Item(_) => {/* ignore for now */}
                 }
             }
             hir::StmtKind::Expr(ref expr, _) => {

Original file line number	Diff line number	Diff line change
`@@ -126,12 +126,12 @@ impl<'a, 'tcx> CFGBuilder<'a, 'tcx> {`
`126`	`126`
`127`	`127`	`fn decl(&mut self, decl: &hir::Decl, pred: CFGIndex) -> CFGIndex {`
`128`	`128`	`match decl.node {`
`129`		`- hir::DeclLocal(ref local) => {`
	`129`	`+ hir::DeclKind::Local(ref local) => {`
`130`	`130`	`let init_exit = self.opt_expr(&local.init, pred);`
`131`	`131`	`self.pat(&local.pat, init_exit)`
`132`	`132`	`}`
`133`	`133`
`134`		`- hir::DeclItem(_) => pred,`
	`134`	`+ hir::DeclKind::Item(_) => pred,`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`
Original file line number	Diff line number	Diff line change
`@@ -949,8 +949,8 @@ pub fn walk_stmt<'v, V: Visitor<'v>>(visitor: &mut V, statement: &'v Stmt) {`
`949`	`949`
`950`	`950`	`pub fn walk_decl<'v, V: Visitor<'v>>(visitor: &mut V, declaration: &'v Decl) {`
`951`	`951`	`match declaration.node {`
`952`		`- DeclLocal(ref local) => visitor.visit_local(local),`
`953`		`- DeclItem(item) => visitor.visit_nested_item(item),`
	`952`	`+ DeclKind::Local(ref local) => visitor.visit_local(local),`
	`953`	`+ DeclKind::Item(item) => visitor.visit_nested_item(item),`
`954`	`954`	`}`
`955`	`955`	`}`
`956`	`956`
Original file line number	Diff line number	Diff line change
`@@ -1575,7 +1575,7 @@ impl<'a> State<'a> {`
`1575`	`1575`	`pub fn print_decl(&mut self, decl: &hir::Decl) -> io::Result<()> {`
`1576`	`1576`	`self.maybe_print_comment(decl.span.lo())?;`
`1577`	`1577`	`match decl.node {`
`1578`		`- hir::DeclLocal(ref loc) => {`
	`1578`	`+ hir::DeclKind::Local(ref loc) => {`
`1579`	`1579`	`self.space_if_not_bol()?;`
`1580`	`1580`	`self.ibox(indent_unit)?;`
`1581`	`1581`	`self.word_nbsp("let")?;`
`@@ -1590,7 +1590,7 @@ impl<'a> State<'a> {`
`1590`	`1590`	`}`
`1591`	`1591`	`self.end()`
`1592`	`1592`	`}`
`1593`		`- hir::DeclItem(item) => {`
	`1593`	`+ hir::DeclKind::Item(item) => {`
`1594`	`1594`	`self.ann.nested(self, Nested::Item(item))`
`1595`	`1595`	`}`
`1596`	`1596`	`}`
`@@ -2400,8 +2400,8 @@ fn stmt_ends_with_semi(stmt: &hir::StmtKind) -> bool {`
`2400`	`2400`	`match *stmt {`
`2401`	`2401`	`hir::StmtKind::Decl(ref d, _) => {`
`2402`	`2402`	`match d.node {`
`2403`		`- hir::DeclLocal(_) => true,`
`2404`		`- hir::DeclItem(_) => false,`
	`2403`	`+ hir::DeclKind::Local(_) => true,`
	`2404`	`+ hir::DeclKind::Item(_) => false,`
`2405`	`2405`	`}`
`2406`	`2406`	`}`
`2407`	`2407`	`hir::StmtKind::Expr(ref e, _) => {`
Original file line number	Diff line number	Diff line change
`@@ -588,11 +588,11 @@ impl<'a, 'gcx, 'tcx> ExprUseVisitor<'a, 'gcx, 'tcx> {`
`588`	`588`	`match stmt.node {`
`589`	`589`	`hir::StmtKind::Decl(ref decl, _) => {`
`590`	`590`	`match decl.node {`
`591`		`- hir::DeclLocal(ref local) => {`
	`591`	`+ hir::DeclKind::Local(ref local) => {`
`592`	`592`	`self.walk_local(&local);`
`593`	`593`	`}`
`594`	`594`
`595`		`- hir::DeclItem(_) => {`
	`595`	`+ hir::DeclKind::Item(_) => {`
`596`	`596`	`// we don't visit nested items in this visitor,`
`597`	`597`	`// only the fn body we were given.`
`598`	`598`	`}`
Original file line number	Diff line number	Diff line change
`@@ -873,10 +873,10 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {`
`873`	`873`	`fn propagate_through_decl(&mut self, decl: &hir::Decl, succ: LiveNode)`
`874`	`874`	`-> LiveNode {`
`875`	`875`	`match decl.node {`
`876`		`- hir::DeclLocal(ref local) => {`
	`876`	`+ hir::DeclKind::Local(ref local) => {`
`877`	`877`	`self.propagate_through_local(&local, succ)`
`878`	`878`	`}`
`879`		`- hir::DeclItem(_) => succ,`
	`879`	`+ hir::DeclKind::Item(_) => succ,`
`880`	`880`	`}`
`881`	`881`	`}`
`882`	`882`
Original file line number	Diff line number	Diff line change
`@@ -67,10 +67,10 @@ fn mirror_stmts<'a, 'gcx, 'tcx>(cx: &mut Cx<'a, 'gcx, 'tcx>,`
`67`	`67`	`}`
`68`	`68`	`hir::StmtKind::Decl(ref decl, _) => {`
`69`	`69`	`match decl.node {`
`70`		`- hir::DeclItem(..) => {`
	`70`	`+ hir::DeclKind::Item(..) => {`
`71`	`71`	`// ignore for purposes of the MIR`
`72`	`72`	`}`
`73`		`- hir::DeclLocal(ref local) => {`
	`73`	`+ hir::DeclKind::Local(ref local) => {`
`74`	`74`	`let remainder_scope = region::Scope::Remainder(BlockRemainder {`
`75`	`75`	`block: block_id,`
`76`	`76`	`first_statement_index: region::FirstStatementIndex::new(index),`
Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ impl<'a, 'tcx> CheckCrateVisitor<'a, 'tcx> {`
`263`	`263`	`match stmt.node {`
`264`	`264`	`hir::StmtKind::Decl(ref decl, _node_id) => {`
`265`	`265`	`match &decl.node {`
`266`		`- hir::DeclLocal(local) => {`
	`266`	`+ hir::DeclKind::Local(local) => {`
`267`	`267`	`if self.remove_mut_rvalue_borrow(&local.pat) {`
`268`	`268`	`if let Some(init) = &local.init {`
`269`	`269`	`self.mut_rvalue_borrows.insert(init.id);`
`@@ -277,7 +277,7 @@ impl<'a, 'tcx> CheckCrateVisitor<'a, 'tcx> {`
`277`	`277`	`NotPromotable`
`278`	`278`	`}`
`279`	`279`	`// Item statements are allowed`
`280`		`- hir::DeclItem(_) => Promotable`
	`280`	`+ hir::DeclKind::Item(_) => Promotable`
`281`	`281`	`}`
`282`	`282`	`}`
`283`	`283`	`hir::StmtKind::Expr(ref box_expr, _node_id) \|`
Original file line number	Diff line number	Diff line change
`@@ -4379,8 +4379,8 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {`
`4379`	`4379`	`match stmt.node {`
`4380`	`4380`	`hir::StmtKind::Decl(ref decl, _) => {`
`4381`	`4381`	`match decl.node {`
`4382`		`- hir::DeclLocal(_) => {}`
`4383`		`- hir::DeclItem(_) => {`
	`4382`	`+ hir::DeclKind::Local(_) => {}`
	`4383`	`+ hir::DeclKind::Item(_) => {`
`4384`	`4384`	`return;`
`4385`	`4385`	`}`
`4386`	`4386`	`}`
`@@ -4399,10 +4399,10 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {`
`4399`	`4399`	`match stmt.node {`
`4400`	`4400`	`hir::StmtKind::Decl(ref decl, _) => {`
`4401`	`4401`	`match decl.node {`
`4402`		`- hir::DeclLocal(ref l) => {`
	`4402`	`+ hir::DeclKind::Local(ref l) => {`
`4403`	`4403`	`self.check_decl_local(&l);`
`4404`	`4404`	`}`
`4405`		`- hir::DeclItem(_) => {/* ignore for now */}`
	`4405`	`+ hir::DeclKind::Item(_) => {/* ignore for now */}`
`4406`	`4406`	`}`
`4407`	`4407`	`}`
`4408`	`4408`	`hir::StmtKind::Expr(ref expr, _) => {`