Remove span from hir::Param.

Author: cjgillot

src/librustc_ast_lowering/expr.rs

@@ -527,7 +527,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
             Ident::with_dummy_span(sym::_task_context),
             hir::BindingAnnotation::Mutable,
         );
-        let param = hir::Param { attrs: &[], hir_id: self.next_id(span), pat, span };
+        let param = hir::Param { attrs: &[], hir_id: self.next_id(span), pat };
         let params = arena_vec![self; param];
 
         let body_id = self.lower_body(move |this| {

src/librustc_ast_lowering/item.rs

@@ -979,7 +979,6 @@ impl<'hir> LoweringContext<'_, 'hir> {
             attrs: self.lower_attrs(&param.attrs),
             hir_id: self.lower_node_id(param.id, param.span),
             pat: self.lower_pat(&param.pat),
-            span: param.span,
         }
     }
 
@@ -1105,7 +1104,6 @@ impl<'hir> LoweringContext<'_, 'hir> {
                     attrs: parameter.attrs,
                     hir_id: parameter.hir_id,
                     pat: new_parameter_pat,
-                    span: parameter.span,
                 };
 
                 if is_simple_parameter {

src/librustc_hir/hir.rs

@@ -2158,7 +2158,6 @@ pub struct Param<'hir> {
     pub attrs: &'hir [Attribute],
     pub hir_id: HirId,
     pub pat: &'hir Pat<'hir>,
-    pub span: Span,
 }
 
 /// Represents the header (not the body) of a function declaration.

src/librustc_middle/hir/map/collector.rs

@@ -336,7 +336,7 @@ impl<'a, 'hir> Visitor<'hir> for NodeCollector<'a, 'hir> {
 
     fn visit_param(&mut self, param: &'hir Param<'hir>) {
         let node = Node::Param(param);
-        self.insert(param.span, param.hir_id, node);
+        self.insert(DUMMY_SP, param.hir_id, node);
         self.with_parent(param.hir_id, |this| {
             intravisit::walk_param(this, param);
         });

src/librustc_mir_build/build/mod.rs

@@ -127,8 +127,9 @@ fn mir_build(tcx: TyCtxt<'_>, def_id: LocalDefId) -> Body<'_> {
                 // C-variadic fns also have a `VaList` input that's not listed in `fn_sig`
                 // (as it's created inside the body itself, not passed in from outside).
                 let ty = if fn_sig.c_variadic && index == fn_sig.inputs().len() {
+                    let span = tcx.hir().span(arg.hir_id);
                     let va_list_did =
-                        tcx.require_lang_item(lang_items::VaListTypeLangItem, Some(arg.span));
+                        tcx.require_lang_item(lang_items::VaListTypeLangItem, Some(span));
 
                     tcx.type_of(va_list_did).subst(tcx, &[tcx.lifetimes.re_erased.into()])
                 } else {

src/librustc_typeck/check/mod.rs

@@ -1327,7 +1327,7 @@ fn check_fn<'a, 'tcx>(
     // C-variadic fns also have a `VaList` input that's not listed in `fn_sig`
     // (as it's created inside the body itself, not passed in from outside).
     let maybe_va_list = if fn_sig.c_variadic {
-        let span = body.params.last().unwrap().span;
+        let span = tcx.hir().span(body.params.last().unwrap().hir_id);
         let va_list_did = tcx.require_lang_item(VaListTypeLangItem, Some(span));
         let region = fcx.next_region_var(RegionVariableOrigin::MiscVariable(span));
 

src/librustc_typeck/check/pat.rs

@@ -606,10 +606,11 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             let binding_parent = tcx.hir().get(binding_parent_id);
             debug!("inner {:?} pat {:?} parent {:?}", inner, pat, binding_parent);
             match binding_parent {
-                hir::Node::Param(hir::Param { span, .. }) => {
+                hir::Node::Param(hir::Param { hir_id, .. }) => {
+                    let span = tcx.hir().span(*hir_id);
                     if let Ok(snippet) = tcx.sess.source_map().span_to_snippet(inner.span) {
                         err.span_suggestion(
-                            *span,
+                            span,
                             &format!("did you mean `{}`", snippet),
                             format!(" &{}", expected),
                             Applicability::MachineApplicable,

src/tools/clippy/clippy_lints/src/unused_self.rs

@@ -67,7 +67,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnusedSelf {
                     span_lint_and_help(
                         cx,
                         UNUSED_SELF,
-                        self_param.span,
+                        cx.tcx.hir().span(self_param.hir_id),
                         "unused `self` argument",
                         None,
                         "consider refactoring to a associated function",