Remove span from hir::Arm.

Author: cjgillot

compiler/rustc_ast_lowering/src/expr.rs

@@ -627,7 +627,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
         });
         let hir_id = self.next_id(arm.span);
         self.lower_attrs(hir_id, &arm.attrs);
-        hir::Arm { hir_id, pat, guard, body: self.lower_expr(&arm.body), span: arm.span }
+        hir::Arm { hir_id, pat, guard, body: self.lower_expr(&arm.body) }
     }
 
     /// Lower an `async` construct to a generator that is then wrapped so it implements `Future`.
@@ -2169,6 +2169,6 @@ impl<'hir> LoweringContext<'_, 'hir> {
     }
 
     fn arm(&mut self, pat: &'hir hir::Pat<'hir>, expr: &'hir hir::Expr<'hir>) -> hir::Arm<'hir> {
-        hir::Arm { hir_id: self.next_id(expr.span), pat, guard: None, span: expr.span, body: expr }
+        hir::Arm { hir_id: self.next_id(expr.span), pat, guard: None, body: expr }
     }
 }

compiler/rustc_hir/src/hir.rs

@@ -1179,7 +1179,6 @@ pub struct Local<'hir> {
 pub struct Arm<'hir> {
     #[stable_hasher(ignore)]
     pub hir_id: HirId,
-    pub span: Span,
     /// If this pattern and the optional guard matches, then `body` is evaluated.
     pub pat: &'hir Pat<'hir>,
     /// Optional guard clause.

compiler/rustc_mir_build/src/thir/cx/expr.rs

@@ -839,7 +839,7 @@ impl<'thir, 'tcx> Cx<'thir, 'tcx> {
             body: self.mirror_expr(arm.body),
             lint_level: LintLevel::Explicit(arm.hir_id),
             scope: region::Scope { id: arm.hir_id.local_id, data: region::ScopeData::Node },
-            span: arm.span,
+            span: self.tcx.hir().span(arm.hir_id),
         }
     }
 

compiler/rustc_passes/src/check_attr.rs

@@ -1238,7 +1238,8 @@ impl Visitor<'tcx> for CheckAttrVisitor<'tcx> {
     }
 
     fn visit_arm(&mut self, arm: &'tcx hir::Arm<'tcx>) {
-        self.check_attributes(arm.hir_id, &arm.span, Target::Arm, None);
+        let span = self.tcx.hir().span(arm.hir_id);
+        self.check_attributes(arm.hir_id, &span, Target::Arm, None);
         intravisit::walk_arm(self, arm);
     }
 

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

@@ -541,7 +541,7 @@ declare_lint_pass!(Loops => [
 impl<'tcx> LateLintPass<'tcx> for Loops {
     #[allow(clippy::too_many_lines)]
     fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
-        if let Some((pat, arg, body, span)) = higher::for_loop(expr) {
+        if let Some((pat, arg, body, span)) = higher::for_loop(cx, expr) {
             // we don't want to check expanded macros
             // this check is not at the top of the function
             // since higher::for_loop expressions are marked as expansions

src/tools/clippy/clippy_lints/src/matches.rs

@@ -1296,7 +1296,8 @@ fn check_match_single_binding<'a>(cx: &LateContext<'a>, ex: &Expr<'a>, arms: &[A
     // a macro. See PR #6435
     if_chain! {
         if let Some(match_snippet) = snippet_opt(cx, expr.span);
-        if let Some(arm_snippet) = snippet_opt(cx, arms[0].span);
+        let arm_span = cx.tcx.hir().span(arms[0].hir_id);
+        if let Some(arm_snippet) = snippet_opt(cx, arm_span);
         if let Some(ex_snippet) = snippet_opt(cx, ex.span);
         let rest_snippet = match_snippet.replace(&arm_snippet, "").replace(&ex_snippet, "");
         if rest_snippet.contains("=>");

src/tools/clippy/clippy_lints/src/methods/iter_next_slice.rs

@@ -17,7 +17,7 @@ pub(super) fn check<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx hir::Expr<'_>, ite
     // since it is already covered by `&loops::ITER_NEXT_LOOP`
     let mut parent_expr_opt = get_parent_expr(cx, expr);
     while let Some(parent_expr) = parent_expr_opt {
-        if higher::for_loop(parent_expr).is_some() {
+        if higher::for_loop(cx, parent_expr).is_some() {
             return;
         }
         parent_expr_opt = get_parent_expr(cx, parent_expr);

src/tools/clippy/clippy_lints/src/mut_mut.rs

@@ -52,7 +52,7 @@ impl<'a, 'tcx> intravisit::Visitor<'tcx> for MutVisitor<'a, 'tcx> {
             return;
         }
 
-        if let Some((_, arg, body, _)) = higher::for_loop(expr) {
+        if let Some((_, arg, body, _)) = higher::for_loop(self.cx, expr) {
             // A `for` loop lowers to:
             // ```rust
             // match ::std::iter::Iterator::next(&mut iter) {

src/tools/clippy/clippy_lints/src/ranges.rs

@@ -441,7 +441,7 @@ fn check_reversed_empty_range(cx: &LateContext<'_>, expr: &Expr<'_>) {
     fn is_for_loop_arg(cx: &LateContext<'_>, expr: &Expr<'_>) -> bool {
         let mut cur_expr = expr;
         while let Some(parent_expr) = get_parent_expr(cx, cur_expr) {
-            match higher::for_loop(parent_expr) {
+            match higher::for_loop(cx, parent_expr) {
                 Some((_, args, _, _)) if args.hir_id == expr.hir_id => return true,
                 _ => cur_expr = parent_expr,
             }

src/tools/clippy/clippy_lints/src/vec.rs

@@ -55,7 +55,7 @@ impl<'tcx> LateLintPass<'tcx> for UselessVec {
 
         // search for `for _ in vec![…]`
         if_chain! {
-            if let Some((_, arg, _, _)) = higher::for_loop(expr);
+            if let Some((_, arg, _, _)) = higher::for_loop(cx, expr);
             if let Some(vec_args) = higher::vec_macro(cx, arg);
             if is_copy(cx, vec_type(cx.typeck_results().expr_ty_adjusted(arg)));
             then {