in which a hir_id field is added to remaining HIR nodes lacking it

This shouldn't really be doing any more work (except taking more memory
to store the extra field)—we were already generating a `HirId` and
immediately throwing it away whenever we said
`.lower_node_id(id).node_id` (respectively `.next_id(id).node_id`)
during lowering; this commit is just keeping the `HirId`, too.

(But this doesn't include, e.g., changing the representation of
`BodyId`.)

This is for the HirIdification initiative no. 50928.

Author: zackmdavis

src/librustc/cfg/construct.rs

@@ -111,13 +111,13 @@ impl<'a, 'tcx> CFGBuilder<'a, 'tcx> {
     fn stmt(&mut self, stmt: &hir::Stmt, pred: CFGIndex) -> CFGIndex {
         let hir_id = self.tcx.hir.node_to_hir_id(stmt.node.id());
         match stmt.node {
-            hir::StmtDecl(ref decl, _) => {
+            hir::StmtDecl(ref decl, _, _) => {
                 let exit = self.decl(&decl, pred);
                 self.add_ast_node(hir_id.local_id, &[exit])
             }
 
-            hir::StmtExpr(ref expr, _) |
-            hir::StmtSemi(ref expr, _) => {
+            hir::StmtExpr(ref expr, _, _) |
+            hir::StmtSemi(ref expr, _, _) => {
                 let exit = self.expr(&expr, pred);
                 self.add_ast_node(hir_id.local_id, &[exit])
             }

src/librustc/hir/check_attr.rs

@@ -269,7 +269,7 @@ impl<'a, 'tcx> CheckAttrVisitor<'a, 'tcx> {
 
     fn check_stmt_attributes(&self, stmt: &hir::Stmt) {
         // When checking statements ignore expressions, they will be checked later
-        if let hir::Stmt_::StmtDecl(_, _) = stmt.node {
+        if let hir::Stmt_::StmtDecl(..) = stmt.node {
             for attr in stmt.node.attrs() {
                 if attr.check_name("inline") {
                     self.check_inline(attr, &stmt.span, Target::Statement);
@@ -348,7 +348,7 @@ fn is_c_like_enum(item: &hir::Item) -> bool {
     if let hir::ItemEnum(ref def, _) = item.node {
         for variant in &def.variants {
             match variant.node.data {
-                hir::VariantData::Unit(_) => { /* continue */ }
+                hir::VariantData::Unit(..) => { /* continue */ }
                 _ => { return false; }
             }
         }

src/librustc/hir/intravisit.rs

@@ -238,6 +238,7 @@ pub trait Visitor<'v> : Sized {
 
     ///////////////////////////////////////////////////////////////////////////
 
+    // FIXME (#50928): should this take a HirId, or should we introduce `visit_hir_id`?
     fn visit_id(&mut self, _node_id: NodeId) {
         // Nothing to do.
     }
@@ -942,12 +943,12 @@ pub fn walk_block<'v, V: Visitor<'v>>(visitor: &mut V, block: &'v Block) {
 
 pub fn walk_stmt<'v, V: Visitor<'v>>(visitor: &mut V, statement: &'v Stmt) {
     match statement.node {
-        StmtDecl(ref declaration, id) => {
+        StmtDecl(ref declaration, id, _hir_id) => {
             visitor.visit_id(id);
             visitor.visit_decl(declaration)
         }
-        StmtExpr(ref expression, id) |
-        StmtSemi(ref expression, id) => {
+        StmtExpr(ref expression, id, _hir_id) |
+        StmtSemi(ref expression, id, _hir_id) => {
             visitor.visit_id(id);
             visitor.visit_expr(expression)
         }