TyCtxt::item_name exists

Author: GrigorenkoPV

compiler/rustc_ast_lowering/src/lib.rs

@@ -1643,7 +1643,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
         for lifetime in captured_lifetimes_to_duplicate {
             let res = self.resolver.get_lifetime_res(lifetime.id).unwrap_or(LifetimeRes::Error);
             let (old_def_id, missing_kind) = match res {
-                LifetimeRes::Param { param: (old_def_id, _), binder: _ } => (old_def_id, None),
+                LifetimeRes::Param { param: old_def_id, binder: _ } => (old_def_id, None),
 
                 LifetimeRes::Fresh { param, kind, .. } => {
                     debug_assert_eq!(lifetime.ident.name, kw::UnderscoreLifetime);
@@ -2061,7 +2061,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
         res: LifetimeRes,
     ) -> &'hir hir::Lifetime {
         let res = match res {
-            LifetimeRes::Param { param: (param, _), .. } => {
+            LifetimeRes::Param { param, .. } => {
                 let param = self.get_remapped_def_id(param);
                 hir::LifetimeName::Param(param)
             }

compiler/rustc_hir/src/def.rs

@@ -8,7 +8,7 @@ use rustc_data_structures::unord::UnordMap;
 use rustc_macros::{Decodable, Encodable, HashStable_Generic};
 use rustc_span::def_id::{DefId, LocalDefId};
 use rustc_span::hygiene::MacroKind;
-use rustc_span::symbol::{kw, Ident};
+use rustc_span::symbol::kw;
 use rustc_span::Symbol;
 
 use crate::definitions::DefPathData;
@@ -796,8 +796,8 @@ impl<Id> Res<Id> {
 pub enum LifetimeRes {
     /// Successfully linked the lifetime to a generic parameter.
     Param {
-        /// `LocalDefId` & `Ident` of the generic parameter that introduced it.
-        param: (LocalDefId, Ident),
+        /// Id of the generic parameter that introduced it.
+        param: LocalDefId,
         /// Id of the introducing place. That can be:
         /// - an item's id, for the item's generic parameters;
         /// - a TraitRef's ref_id, identifying the `for<...>` binder;

compiler/rustc_lint/src/context/diagnostics.rs

@@ -446,11 +446,13 @@ pub(super) fn decorate_lint(sess: &Session, diagnostic: BuiltinLintDiag, diag: &
             lints::ElidedNamedLifetime { elided, name: kw::StaticLifetime, named_declaration: None }
                 .decorate_lint(diag)
         }
-        BuiltinLintDiag::ElidedIsParam { elided, param } => lints::ElidedNamedLifetime {
-            elided,
-            name: param.name,
-            named_declaration: Some(param.span),
+        BuiltinLintDiag::ElidedIsParam { elided, param: (param_name, param_span) } => {
+            lints::ElidedNamedLifetime {
+                elided,
+                name: param_name,
+                named_declaration: Some(param_span),
+            }
+            .decorate_lint(diag)
         }
-        .decorate_lint(diag),
     }
 }

compiler/rustc_lint_defs/src/lib.rs

@@ -590,7 +590,7 @@ pub enum BuiltinLintDiag {
     },
     ElidedIsParam {
         elided: Span,
-        param: Ident,
+        param: (Symbol, Span),
     },
     UnknownCrateTypes {
         span: Span,

compiler/rustc_resolve/src/late.rs

@@ -1598,7 +1598,7 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
             if let Some(&(_, res)) = rib.bindings.get(&normalized_ident) {
                 self.record_lifetime_res(lifetime.id, res, LifetimeElisionCandidate::Named);
 
-                if let LifetimeRes::Param { param: (param, _), binder } = res {
+                if let LifetimeRes::Param { param, binder } = res {
                     match self.lifetime_uses.entry(param) {
                         Entry::Vacant(v) => {
                             debug!("First use of {:?} at {:?}", res, ident.span);
@@ -2079,7 +2079,8 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
                             );
                         }
                     }
-                    LifetimeRes::Param { param: (_, param), binder } => {
+                    LifetimeRes::Param { param, binder } => {
+                        let tcx = self.r.tcx();
                         self.r.lint_buffer.buffer_lint(
                             lint::builtin::ELIDED_NAMED_LIFETIMES,
                             // It should be possible to use `self.crate_node_id`
@@ -2089,7 +2090,10 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
                             // we would have to do some additional work.
                             missing.id_if_exists_in_source_or(binder),
                             missing.span,
-                            BuiltinLintDiag::ElidedIsParam { elided, param },
+                            BuiltinLintDiag::ElidedIsParam {
+                                elided,
+                                param: (tcx.item_name(param.into()), tcx.source_span(param)),
+                            },
                         );
                     }
                     LifetimeRes::Fresh { .. }
@@ -2824,7 +2828,7 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
                         (&mut function_value_rib, DefKind::ConstParam)
                     }
                     GenericParamKind::Lifetime => {
-                        let res = LifetimeRes::Param { param: (def_id, param.ident), binder };
+                        let res = LifetimeRes::Param { param: def_id, binder };
                         self.record_lifetime_param(param.id, res);
                         function_lifetime_rib.bindings.insert(ident, (param.id, res));
                         continue;