Update clippy and rustfmt

Author: Aaron1011

src/tools/clippy/clippy_lints/src/default.rs

@@ -134,7 +134,7 @@ impl LateLintPass<'_> for Default {
                 if adt.is_struct();
                 let variant = adt.non_enum_variant();
                 if adt.did.is_local() || !variant.is_field_list_non_exhaustive();
-                let module_did = cx.tcx.parent_module(stmt.hir_id).to_def_id();
+                let module_did = cx.tcx.parent_module(stmt.kind.hir_id()).to_def_id();
                 if variant
                     .fields
                     .iter()

src/tools/clippy/clippy_lints/src/items_after_statements.rs

@@ -63,7 +63,7 @@ impl EarlyLintPass for ItemsAfterStatements {
             .stmts
             .iter()
             .map(|stmt| &stmt.kind)
-            .skip_while(|s| matches!(**s, StmtKind::Item(..) | StmtKind::Empty));
+            .skip_while(|s| matches!(**s, StmtKind::Item(..) | StmtKind::Empty { id: _ }));
 
         // lint on all further items
         for stmt in stmts {

src/tools/clippy/clippy_lints/src/loops/utils.rs

@@ -256,14 +256,6 @@ pub(super) struct LoopNestVisitor {
 impl<'tcx> Visitor<'tcx> for LoopNestVisitor {
     type Map = Map<'tcx>;
 
-    fn visit_stmt(&mut self, stmt: &'tcx Stmt<'_>) {
-        if stmt.hir_id == self.hir_id {
-            self.nesting = LookFurther;
-        } else if self.nesting == Unknown {
-            walk_stmt(self, stmt);
-        }
-    }
-
     fn visit_expr(&mut self, expr: &'tcx Expr<'_>) {
         if self.nesting != Unknown {
             return;

src/tools/clippy/clippy_lints/src/slow_vector_initialization.rs

@@ -106,7 +106,7 @@ impl<'tcx> LateLintPass<'tcx> for SlowVectorInit {
                     len_expr: len_arg,
                 };
 
-                Self::search_initialization(cx, vi, stmt.hir_id);
+                Self::search_initialization(cx, vi, stmt.kind.hir_id());
             }
         }
     }

src/tools/clippy/clippy_lints/src/utils/author.rs

@@ -130,7 +130,7 @@ impl<'tcx> LateLintPass<'tcx> for Author {
     }
 
     fn check_stmt(&mut self, cx: &LateContext<'tcx>, stmt: &'tcx hir::Stmt<'_>) {
-        if !has_attr(cx, stmt.hir_id) {
+        if !has_attr(cx, stmt.kind.hir_id()) {
             return;
         }
         match stmt.kind {

src/tools/clippy/clippy_lints/src/utils/inspector.rs

@@ -110,7 +110,7 @@ impl<'tcx> LateLintPass<'tcx> for DeepCodeInspector {
     }
 
     fn check_stmt(&mut self, cx: &LateContext<'tcx>, stmt: &'tcx hir::Stmt<'_>) {
-        if !has_attr(cx.sess(), cx.tcx.hir().attrs(stmt.hir_id)) {
+        if !has_attr(cx.sess(), cx.tcx.hir().attrs(stmt.kind.hir_id())) {
             return;
         }
         match stmt.kind {

src/tools/clippy/clippy_utils/src/ast_utils.rs

@@ -226,7 +226,7 @@ pub fn eq_stmt(l: &Stmt, r: &Stmt) -> bool {
         },
         (Item(l), Item(r)) => eq_item(l, r, eq_item_kind),
         (Expr(l), Expr(r)) | (Semi(l), Semi(r)) => eq_expr(l, r),
-        (Empty, Empty) => true,
+        (Empty { id: _ }, Empty { id : _ }) => true,
         (MacCall(l), MacCall(r)) => {
             l.style == r.style && eq_mac_call(&l.mac, &r.mac) && over(&l.attrs, &r.attrs, |l, r| eq_attr(l, r))
         },

src/tools/rustfmt/src/attr.rs

@@ -43,7 +43,7 @@ pub(crate) fn get_span_without_attrs(stmt: &ast::Stmt) -> Span {
         ast::StmtKind::Item(ref item) => item.span,
         ast::StmtKind::Expr(ref expr) | ast::StmtKind::Semi(ref expr) => expr.span,
         ast::StmtKind::MacCall(ref mac_stmt) => mac_stmt.mac.span(),
-        ast::StmtKind::Empty => stmt.span,
+        ast::StmtKind::Empty { id: _ } => stmt.span,
     }
 }
 

src/tools/rustfmt/src/closures.rs

@@ -148,7 +148,6 @@ fn rewrite_closure_with_block(
 
     let block = ast::Block {
         stmts: vec![ast::Stmt {
-            id: ast::NodeId::root(),
             kind: ast::StmtKind::Expr(ptr::P(body.clone())),
             span: body.span,
         }],

src/tools/rustfmt/src/expr.rs

@@ -1138,7 +1138,7 @@ fn block_has_statements(block: &ast::Block) -> bool {
     block
         .stmts
         .iter()
-        .any(|stmt| !matches!(stmt.kind, ast::StmtKind::Empty))
+        .any(|stmt| !matches!(stmt.kind, ast::StmtKind::Empty { id: _ }))
 }
 
 /// Checks whether a block contains no statements, expressions, comments, or

src/tools/rustfmt/src/spanned.rs

@@ -73,7 +73,7 @@ impl Spanned for ast::Stmt {
                     mk_sp(mac_stmt.attrs[0].span.lo(), self.span.hi())
                 }
             }
-            ast::StmtKind::Empty => self.span,
+            ast::StmtKind::Empty { id: _ } => self.span,
         }
     }
 }

src/tools/rustfmt/src/stmt.rs

@@ -53,7 +53,7 @@ impl<'a> Stmt<'a> {
     }
 
     pub(crate) fn is_empty(&self) -> bool {
-        matches!(self.inner.kind, ast::StmtKind::Empty)
+        matches!(self.inner.kind, ast::StmtKind::Empty { id: _ })
     }
 
     fn is_last_expr(&self) -> bool {
@@ -110,7 +110,7 @@ fn format_stmt(
             let shape = shape.sub_width(suffix.len())?;
             format_expr(ex, expr_type, context, shape).map(|s| s + suffix)
         }
-        ast::StmtKind::MacCall(..) | ast::StmtKind::Item(..) | ast::StmtKind::Empty => None,
+        ast::StmtKind::MacCall(..) | ast::StmtKind::Item(..) | ast::StmtKind::Empty { id: _ } => None,
     };
     result.and_then(|res| recover_comment_removed(res, stmt.span(), context))
 }

src/tools/rustfmt/src/visitor.rs

@@ -180,7 +180,7 @@ impl<'b, 'a: 'b> FmtVisitor<'a> {
                 }
                 self.format_missing(stmt.span().hi());
             }
-            ast::StmtKind::Empty => (),
+            ast::StmtKind::Empty { id: _ } => (),
         }
     }
 
@@ -955,7 +955,7 @@ impl<'b, 'a: 'b> FmtVisitor<'a> {
             let include_next_empty = if stmts.len() > 1 {
                 matches!(
                     (&stmts[0].as_ast_node().kind, &stmts[1].as_ast_node().kind),
-                    (ast::StmtKind::Item(_), ast::StmtKind::Empty)
+                    (ast::StmtKind::Item(_), ast::StmtKind::Empty { id: _ })
                 )
             } else {
                 false