Remove '_ from the keyword list.

nnethercote · nnethercote · commit ebf1508cfb31 · 2024-12-13T14:10:27.000+11:00
The anonymous lifetime `'_` is not a keyword according to the Reference
and the Ferrocene spec. This commit changes it to a symbol. It wasn't
included in any of the `Symbol::is_*` functions, so this has no
functional effect.
diff --git a/compiler/rustc_ast_lowering/src/lib.rs b/compiler/rustc_ast_lowering/src/lib.rs
@@ -755,7 +755,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
                 let _def_id = self.create_def(
                     self.current_hir_id_owner.def_id,
                     param,
-                    kw::UnderscoreLifetime,
+                    sym::underscore_lifetime,
                     DefKind::LifetimeParam,
                     ident.span,
                 );
@@ -1187,7 +1187,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
                         self.next_node_id()
                     };
                     let span = self.tcx.sess.source_map().start_point(t.span).shrink_to_hi();
-                    Lifetime { ident: Ident::new(kw::UnderscoreLifetime, span), id }
+                    Lifetime { ident: Ident::new(sym::underscore_lifetime, span), id }
                 });
                 let lifetime = self.lower_lifetime(&region);
                 hir::TyKind::Ref(lifetime, self.lower_mt(mt, itctx))
@@ -1203,7 +1203,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
                         self.next_node_id()
                     };
                     let span = self.tcx.sess.source_map().start_point(t.span).shrink_to_hi();
-                    Lifetime { ident: Ident::new(kw::UnderscoreLifetime, span), id }
+                    Lifetime { ident: Ident::new(sym::underscore_lifetime, span), id }
                 });
                 let lifetime = self.lower_lifetime(&region);
                 let kind = hir::TyKind::Ref(lifetime, self.lower_mt(mt, itctx));
diff --git a/compiler/rustc_borrowck/src/diagnostics/explain_borrow.rs b/compiler/rustc_borrowck/src/diagnostics/explain_borrow.rs
@@ -17,7 +17,7 @@ use rustc_middle::mir::{
 };
 use rustc_middle::ty::adjustment::PointerCoercion;
 use rustc_middle::ty::{self, RegionVid, Ty, TyCtxt};
-use rustc_span::symbol::{Symbol, kw};
+use rustc_span::symbol::Symbol;
 use rustc_span::{DesugaringKind, Span, sym};
 use rustc_trait_selection::error_reporting::traits::FindExprBySpan;
 use tracing::{debug, instrument};
@@ -418,7 +418,7 @@ impl<'tcx> BorrowExplanation<'tcx> {
         }
         if let ConstraintCategory::OpaqueType = category {
             let suggestable_name =
-                if region_name.was_named() { region_name.name } else { kw::UnderscoreLifetime };
+                if region_name.was_named() { region_name.name } else { sym::underscore_lifetime };
 
             let msg = format!(
                 "you can add a bound to the {}to make it last less than `'static` and match `{region_name}`",
diff --git a/compiler/rustc_borrowck/src/diagnostics/region_errors.rs b/compiler/rustc_borrowck/src/diagnostics/region_errors.rs
@@ -16,7 +16,7 @@ use rustc_middle::hir::place::PlaceBase;
 use rustc_middle::mir::{ConstraintCategory, ReturnConstraint};
 use rustc_middle::ty::{self, GenericArgs, Region, RegionVid, Ty, TyCtxt, TypeVisitor};
 use rustc_span::Span;
-use rustc_span::symbol::{Ident, kw};
+use rustc_span::symbol::{Ident, kw, sym};
 use rustc_trait_selection::error_reporting::InferCtxtErrorExt;
 use rustc_trait_selection::error_reporting::infer::nice_region_error::{
     self, HirTraitObjectVisitor, NiceRegionError, TraitObjectVisitor, find_anon_type,
@@ -786,7 +786,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
         // These situations are bound to result in errors.
         // To prevent an immediate ICE, we opt to create a dummy name instead.
         let fr_name = self.give_region_a_name(*fr).unwrap_or(RegionName {
-            name: kw::UnderscoreLifetime,
+            name: sym::underscore_lifetime,
             source: RegionNameSource::Static,
         });
         fr_name.highlight_region_name(&mut diag);
@@ -858,7 +858,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
                 return;
             };
 
-            let lifetime = if f.has_name() { fr_name.name } else { kw::UnderscoreLifetime };
+            let lifetime = if f.has_name() { fr_name.name } else { sym::underscore_lifetime };
 
             let arg = match param.param.pat.simple_ident() {
                 Some(simple_ident) => format!("argument `{simple_ident}`"),
diff --git a/compiler/rustc_hir/src/hir.rs b/compiler/rustc_hir/src/hir.rs
@@ -75,7 +75,7 @@ impl ParamName {
     pub fn ident(&self) -> Ident {
         match *self {
             ParamName::Plain(ident) => ident,
-            ParamName::Fresh | ParamName::Error => Ident::with_dummy_span(kw::UnderscoreLifetime),
+            ParamName::Fresh | ParamName::Error => Ident::with_dummy_span(sym::underscore_lifetime),
         }
     }
 }
@@ -149,7 +149,7 @@ impl Lifetime {
     }
 
     pub fn is_anonymous(&self) -> bool {
-        self.ident.name == kw::Empty || self.ident.name == kw::UnderscoreLifetime
+        self.ident.name == kw::Empty || self.ident.name == sym::underscore_lifetime
     }
 
     pub fn suggestion_position(&self) -> (LifetimeSuggestionPosition, Span) {
diff --git a/compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs b/compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs
@@ -45,7 +45,7 @@ use rustc_middle::ty::{
 use rustc_middle::{bug, span_bug};
 use rustc_session::lint::builtin::AMBIGUOUS_ASSOCIATED_ITEMS;
 use rustc_span::edit_distance::find_best_match_for_name;
-use rustc_span::symbol::{Ident, Symbol, kw};
+use rustc_span::symbol::{Ident, Symbol, kw, sym};
 use rustc_span::{DUMMY_SP, Span};
 use rustc_trait_selection::infer::InferCtxtExt;
 use rustc_trait_selection::traits::wf::object_region_bounds;
@@ -2655,15 +2655,15 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
     ) {
         for br in referenced_regions.difference(&constrained_regions) {
             let br_name = match *br {
-                ty::BoundRegionKind::Named(_, kw::UnderscoreLifetime)
+                ty::BoundRegionKind::Named(_, sym::underscore_lifetime)
                 | ty::BoundRegionKind::Anon
                 | ty::BoundRegionKind::ClosureEnv => "an anonymous lifetime".to_string(),
                 ty::BoundRegionKind::Named(_, name) => format!("lifetime `{name}`"),
             };
 
             let mut err = generate_err(&br_name);
 
-            if let ty::BoundRegionKind::Named(_, kw::UnderscoreLifetime)
+            if let ty::BoundRegionKind::Named(_, sym::underscore_lifetime)
             | ty::BoundRegionKind::Anon = *br
             {
                 // The only way for an anonymous lifetime to wind up
diff --git a/compiler/rustc_middle/src/ty/generics.rs b/compiler/rustc_middle/src/ty/generics.rs
@@ -3,7 +3,7 @@ use rustc_data_structures::fx::FxHashMap;
 use rustc_hir::def_id::DefId;
 use rustc_macros::{HashStable, TyDecodable, TyEncodable};
 use rustc_span::Span;
-use rustc_span::symbol::{Symbol, kw};
+use rustc_span::symbol::{Symbol, kw, sym};
 use tracing::instrument;
 
 use super::{Clause, InstantiatedPredicates, ParamConst, ParamTy, Ty, TyCtxt};
@@ -75,7 +75,7 @@ impl GenericParamDef {
     pub fn is_anonymous_lifetime(&self) -> bool {
         match self.kind {
             GenericParamDefKind::Lifetime => {
-                self.name == kw::UnderscoreLifetime || self.name == kw::Empty
+                self.name == sym::underscore_lifetime || self.name == kw::Empty
             }
             _ => false,
         }
diff --git a/compiler/rustc_middle/src/ty/mod.rs b/compiler/rustc_middle/src/ty/mod.rs
@@ -451,7 +451,7 @@ impl EarlyParamRegion {
     /// Does this early bound region have a name? Early bound regions normally
     /// always have names except when using anonymous lifetimes (`'_`).
     pub fn has_name(&self) -> bool {
-        self.name != kw::UnderscoreLifetime && self.name != kw::Empty
+        self.name != sym::underscore_lifetime && self.name != kw::Empty
     }
 }
 
diff --git a/compiler/rustc_middle/src/ty/print/pretty.rs b/compiler/rustc_middle/src/ty/print/pretty.rs
@@ -2676,7 +2676,7 @@ impl<'tcx> FmtPrinter<'_, 'tcx> {
 
                         (name, ty::BoundRegionKind::Named(CRATE_DEF_ID.to_def_id(), name))
                     }
-                    ty::BoundRegionKind::Named(def_id, kw::UnderscoreLifetime | kw::Empty) => {
+                    ty::BoundRegionKind::Named(def_id, sym::underscore_lifetime | kw::Empty) => {
                         let name = next_name(self);
 
                         if let Some(lt_idx) = lifetime_idx {
diff --git a/compiler/rustc_middle/src/ty/region.rs b/compiler/rustc_middle/src/ty/region.rs
@@ -411,7 +411,9 @@ impl core::fmt::Debug for BoundRegion {
 impl BoundRegionKind {
     pub fn is_named(&self) -> bool {
         match *self {
-            BoundRegionKind::Named(_, name) => name != kw::UnderscoreLifetime && name != kw::Empty,
+            BoundRegionKind::Named(_, name) => {
+                name != sym::underscore_lifetime && name != kw::Empty
+            }
             _ => false,
         }
     }
diff --git a/compiler/rustc_parse/src/parser/ty.rs b/compiler/rustc_parse/src/parser/ty.rs
@@ -1273,7 +1273,7 @@ impl<'a> Parser<'a> {
         if let Some((ident, is_raw)) = self.token.lifetime() {
             if matches!(is_raw, IdentIsRaw::No)
                 && ident.without_first_quote().is_reserved()
-                && ![kw::UnderscoreLifetime, kw::StaticLifetime].contains(&ident.name)
+                && ![sym::underscore_lifetime, kw::StaticLifetime].contains(&ident.name)
             {
                 self.dcx().emit_err(errors::KeywordLifetime { span: ident.span });
             }
diff --git a/compiler/rustc_resolve/src/late.rs b/compiler/rustc_resolve/src/late.rs
@@ -1616,7 +1616,7 @@ impl<'a, 'ast, 'ra: 'ast, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
             return;
         }
 
-        if ident.name == kw::UnderscoreLifetime {
+        if ident.name == sym::underscore_lifetime {
             return self.resolve_anonymous_lifetime(lifetime, lifetime.id, false);
         }
 
@@ -1726,7 +1726,7 @@ impl<'a, 'ast, 'ra: 'ast, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
         id_for_lint: NodeId,
         elided: bool,
     ) {
-        debug_assert_eq!(lifetime.ident.name, kw::UnderscoreLifetime);
+        debug_assert_eq!(lifetime.ident.name, sym::underscore_lifetime);
 
         let kind =
             if elided { MissingLifetimeKind::Ampersand } else { MissingLifetimeKind::Underscore };
@@ -1855,7 +1855,7 @@ impl<'a, 'ast, 'ra: 'ast, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
     #[instrument(level = "debug", skip(self))]
     fn resolve_elided_lifetime(&mut self, anchor_id: NodeId, span: Span) {
         let id = self.r.next_node_id();
-        let lt = Lifetime { id, ident: Ident::new(kw::UnderscoreLifetime, span) };
+        let lt = Lifetime { id, ident: Ident::new(sym::underscore_lifetime, span) };
 
         self.record_lifetime_res(
             anchor_id,
@@ -1872,7 +1872,7 @@ impl<'a, 'ast, 'ra: 'ast, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
         binder: NodeId,
         kind: MissingLifetimeKind,
     ) -> LifetimeRes {
-        debug_assert_eq!(ident.name, kw::UnderscoreLifetime);
+        debug_assert_eq!(ident.name, sym::underscore_lifetime);
         debug!(?ident.span);
 
         // Leave the responsibility to create the `LocalDefId` to lowering.
@@ -1973,7 +1973,7 @@ impl<'a, 'ast, 'ra: 'ast, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
                 // originating from macros, since the segment's span might be from a macro arg.
                 segment.ident.span.find_ancestor_inside(path_span).unwrap_or(path_span)
             };
-            let ident = Ident::new(kw::UnderscoreLifetime, elided_lifetime_span);
+            let ident = Ident::new(sym::underscore_lifetime, elided_lifetime_span);
 
             let kind = if segment.has_generic_args {
                 MissingLifetimeKind::Comma
@@ -2850,7 +2850,7 @@ impl<'a, 'ast, 'ra: 'ast, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
                     }
                 }
 
-                if param.ident.name == kw::UnderscoreLifetime {
+                if param.ident.name == sym::underscore_lifetime {
                     self.r
                         .dcx()
                         .emit_err(errors::UnderscoreLifetimeIsReserved { span: param.ident.span });
diff --git a/compiler/rustc_resolve/src/late/diagnostics.rs b/compiler/rustc_resolve/src/late/diagnostics.rs
@@ -2744,7 +2744,7 @@ impl<'ast, 'ra: 'ast, 'tcx> LateResolutionVisitor<'_, 'ast, 'ra, 'tcx> {
         lifetime_ref: &ast::Lifetime,
         outer_lifetime_ref: Option<Ident>,
     ) {
-        debug_assert_ne!(lifetime_ref.ident.name, kw::UnderscoreLifetime);
+        debug_assert_ne!(lifetime_ref.ident.name, sym::underscore_lifetime);
         let mut err = if let Some(outer) = outer_lifetime_ref {
             struct_span_code_err!(
                 self.r.dcx(),
@@ -3035,7 +3035,7 @@ impl<'ast, 'ra: 'ast, 'tcx> LateResolutionVisitor<'_, 'ast, 'ra, 'tcx> {
             })
             .flat_map(|rib| rib.bindings.iter())
             .map(|(&ident, &res)| (ident, res))
-            .filter(|(ident, _)| ident.name != kw::UnderscoreLifetime)
+            .filter(|(ident, _)| ident.name != sym::underscore_lifetime)
             .collect();
         debug!(?in_scope_lifetimes);
 
diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs
@@ -91,7 +91,6 @@ symbols! {
         Try:                "try", // >= 2018 Edition only
 
         // Special lifetime names
-        UnderscoreLifetime: "'_",
         StaticLifetime:     "'static",
 
         // Weak keywords, have special meaning only in specific contexts.
@@ -2084,6 +2083,7 @@ symbols! {
         unchecked_sub,
         underscore_const_names,
         underscore_imports,
+        underscore_lifetime: "'_",
         underscore_lifetimes,
         uniform_paths,
         unimplemented_macro,
diff --git a/compiler/rustc_trait_selection/src/error_reporting/infer/nice_region_error/named_anon_conflict.rs b/compiler/rustc_trait_selection/src/error_reporting/infer/nice_region_error/named_anon_conflict.rs
@@ -3,7 +3,7 @@
 
 use rustc_errors::Diag;
 use rustc_middle::ty;
-use rustc_span::symbol::kw;
+use rustc_span::symbol::sym;
 use tracing::debug;
 
 use crate::error_reporting::infer::nice_region_error::NiceRegionError;
@@ -60,7 +60,8 @@ impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
         let is_impl_item = region_info.is_impl_item;
 
         match br {
-            ty::BoundRegionKind::Named(_, kw::UnderscoreLifetime) | ty::BoundRegionKind::Anon => {}
+            ty::BoundRegionKind::Named(_, sym::underscore_lifetime) | ty::BoundRegionKind::Anon => {
+            }
             _ => {
                 /* not an anonymous region */
                 debug!("try_report_named_anon_conflict: not an anonymous region");
diff --git a/compiler/rustc_trait_selection/src/error_reporting/infer/region.rs b/compiler/rustc_trait_selection/src/error_reporting/infer/region.rs
@@ -12,7 +12,7 @@ use rustc_middle::bug;
 use rustc_middle::traits::ObligationCauseCode;
 use rustc_middle::ty::error::TypeError;
 use rustc_middle::ty::{self, IsSuggestable, Region, Ty, TyCtxt, TypeVisitableExt as _};
-use rustc_span::symbol::kw;
+use rustc_span::symbol::{kw, sym};
 use rustc_span::{BytePos, ErrorGuaranteed, Span, Symbol};
 use rustc_type_ir::Upcast as _;
 use tracing::{debug, instrument};
@@ -1105,7 +1105,7 @@ fn msg_span_from_named_region<'tcx>(
                 match fr.bound_region {
                     ty::BoundRegionKind::Named(param_def_id, name) => {
                         let span = tcx.def_span(param_def_id);
-                        let text = if name == kw::UnderscoreLifetime {
+                        let text = if name == sym::underscore_lifetime {
                             "the anonymous lifetime as defined here".to_string()
                         } else {
                             format!("the lifetime `{name}` as defined here")
diff --git a/compiler/rustc_trait_selection/src/errors.rs b/compiler/rustc_trait_selection/src/errors.rs
@@ -14,7 +14,7 @@ use rustc_hir::{FnRetTy, GenericParamKind, Node};
 use rustc_macros::{Diagnostic, Subdiagnostic};
 use rustc_middle::ty::print::{PrintTraitRefExt as _, TraitRefPrintOnlyTraitPath};
 use rustc_middle::ty::{self, Binder, ClosureKind, FnSig, PolyTraitRef, Region, Ty, TyCtxt};
-use rustc_span::symbol::{Ident, Symbol, kw};
+use rustc_span::symbol::{Ident, Symbol, kw, sym};
 use rustc_span::{BytePos, Span};
 
 use crate::error_reporting::infer::ObligationCauseAsDiagArg;
@@ -548,7 +548,7 @@ impl Subdiagnostic for AddLifetimeParamsSuggestion<'_> {
                 .iter()
                 .filter(|p| matches!(p.kind, GenericParamKind::Lifetime { .. }))
                 .map(|p| p.name.ident().name)
-                .find(|i| *i != kw::UnderscoreLifetime);
+                .find(|i| *i != sym::underscore_lifetime);
             let introduce_new = suggestion_param_name.is_none();
 
             let mut default = "'a".to_string();
@@ -558,7 +558,7 @@ impl Subdiagnostic for AddLifetimeParamsSuggestion<'_> {
                     .iter()
                     .filter(|p| matches!(p.kind, GenericParamKind::Lifetime { .. }))
                     .map(|p| p.name.ident().name)
-                    .filter(|i| *i != kw::UnderscoreLifetime)
+                    .filter(|i| *i != sym::underscore_lifetime)
                     .map(|l| l.to_string())
                     .collect();
                 if let Some(lt) =
@@ -584,7 +584,7 @@ impl Subdiagnostic for AddLifetimeParamsSuggestion<'_> {
                     let make_suggestion = |ident: Ident| {
                         if ident.name == kw::Empty && ident.span.is_empty() {
                             format!("{}, ", self.suggestion_param_name)
-                        } else if ident.name == kw::UnderscoreLifetime && ident.span.is_empty() {
+                        } else if ident.name == sym::underscore_lifetime && ident.span.is_empty() {
                             format!("{} ", self.suggestion_param_name)
                         } else {
                             self.suggestion_param_name.clone()
diff --git a/compiler/rustc_trait_selection/src/errors/note_and_explain.rs b/compiler/rustc_trait_selection/src/errors/note_and_explain.rs
@@ -3,7 +3,7 @@ use rustc_hir::def_id::LocalDefId;
 use rustc_middle::bug;
 use rustc_middle::ty::{self, TyCtxt};
 use rustc_span::Span;
-use rustc_span::symbol::kw;
+use rustc_span::symbol::sym;
 
 use crate::error_reporting::infer::nice_region_error::find_anon_type;
 use crate::fluent_generated as fluent;
@@ -58,7 +58,7 @@ impl<'a> DescriptionCtx<'a> {
                             } else {
                                 tcx.def_span(scope)
                             };
-                            if name == kw::UnderscoreLifetime {
+                            if name == sym::underscore_lifetime {
                                 (Some(span), "as_defined_anon", String::new())
                             } else {
                                 (Some(span), "as_defined", name.to_string())
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs
@@ -2140,7 +2140,7 @@ pub(crate) fn clean_middle_ty<'tcx>(
                 .flat_map(|pred| pred.bound_vars())
                 .filter_map(|var| match var {
                     ty::BoundVariableKind::Region(ty::BoundRegionKind::Named(def_id, name))
-                        if name != kw::UnderscoreLifetime =>
+                        if name != sym::underscore_lifetime =>
                     {
                         Some(GenericParamDef::lifetime(def_id, name))
                     }
@@ -3104,7 +3104,7 @@ fn clean_bound_vars(bound_vars: &ty::List<ty::BoundVariableKind>) -> Vec<Generic
         .into_iter()
         .filter_map(|var| match var {
             ty::BoundVariableKind::Region(ty::BoundRegionKind::Named(def_id, name))
-                if name != kw::UnderscoreLifetime =>
+                if name != sym::underscore_lifetime =>
             {
                 Some(GenericParamDef::lifetime(def_id, name))
             }
diff --git a/src/librustdoc/clean/types.rs b/src/librustdoc/clean/types.rs
@@ -1303,7 +1303,7 @@ impl Lifetime {
     }
 
     pub(crate) fn elided() -> Lifetime {
-        Lifetime(kw::UnderscoreLifetime)
+        Lifetime(sym::underscore_lifetime)
     }
 }
 
diff --git a/src/tools/rustfmt/src/parse/macros/mod.rs b/src/tools/rustfmt/src/parse/macros/mod.rs
@@ -170,7 +170,7 @@ pub(crate) fn parse_expr(
     parser.parse_expr().ok()
 }
 
-const RUST_KW: [Symbol; 59] = [
+const RUST_KW: [Symbol; 58] = [
     kw::PathRoot,
     kw::DollarCrate,
     kw::Underscore,
@@ -224,7 +224,6 @@ const RUST_KW: [Symbol; 59] = [
     kw::Dyn,
     kw::Async,
     kw::Try,
-    kw::UnderscoreLifetime,
     kw::StaticLifetime,
     kw::Auto,
     kw::Catch,

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ impl ParamName {`
`75`	`75`	`pub fn ident(&self) -> Ident {`
`76`	`76`	`match *self {`
`77`	`77`	`ParamName::Plain(ident) => ident,`
`78`		`- ParamName::Fresh \| ParamName::Error => Ident::with_dummy_span(kw::UnderscoreLifetime),`
	`78`	`+ ParamName::Fresh \| ParamName::Error => Ident::with_dummy_span(sym::underscore_lifetime),`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`	`}`
`@@ -149,7 +149,7 @@ impl Lifetime {`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`pub fn is_anonymous(&self) -> bool {`
`152`		`- self.ident.name == kw::Empty \|\| self.ident.name == kw::UnderscoreLifetime`
	`152`	`+ self.ident.name == kw::Empty \|\| self.ident.name == sym::underscore_lifetime`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`pub fn suggestion_position(&self) -> (LifetimeSuggestionPosition, Span) {`
Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,7 @@ impl EarlyParamRegion {`
`451`	`451`	`/// Does this early bound region have a name? Early bound regions normally`
`452`	`452`	/// always have names except when using anonymous lifetimes (`'_`).
`453`	`453`	`pub fn has_name(&self) -> bool {`
`454`		`- self.name != kw::UnderscoreLifetime && self.name != kw::Empty`
	`454`	`+ self.name != sym::underscore_lifetime && self.name != kw::Empty`
`455`	`455`	`}`
`456`	`456`	`}`
`457`	`457`
Original file line number	Diff line number	Diff line change
`@@ -2676,7 +2676,7 @@ impl<'tcx> FmtPrinter<'_, 'tcx> {`
`2676`	`2676`
`2677`	`2677`	`(name, ty::BoundRegionKind::Named(CRATE_DEF_ID.to_def_id(), name))`
`2678`	`2678`	`}`
`2679`		`- ty::BoundRegionKind::Named(def_id, kw::UnderscoreLifetime \| kw::Empty) => {`
	`2679`	`+ ty::BoundRegionKind::Named(def_id, sym::underscore_lifetime \| kw::Empty) => {`
`2680`	`2680`	`let name = next_name(self);`
`2681`	`2681`
`2682`	`2682`	`if let Some(lt_idx) = lifetime_idx {`
Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,9 @@ impl core::fmt::Debug for BoundRegion {`
`411`	`411`	`impl BoundRegionKind {`
`412`	`412`	`pub fn is_named(&self) -> bool {`
`413`	`413`	`match *self {`
`414`		`- BoundRegionKind::Named(_, name) => name != kw::UnderscoreLifetime && name != kw::Empty,`
	`414`	`+ BoundRegionKind::Named(_, name) => {`
	`415`	`+ name != sym::underscore_lifetime && name != kw::Empty`
	`416`	`+ }`
`415`	`417`	`_ => false,`
`416`	`418`	`}`
`417`	`419`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1273,7 +1273,7 @@ impl<'a> Parser<'a> {`
`1273`	`1273`	`if let Some((ident, is_raw)) = self.token.lifetime() {`
`1274`	`1274`	`if matches!(is_raw, IdentIsRaw::No)`
`1275`	`1275`	`&& ident.without_first_quote().is_reserved()`
`1276`		`- && ![kw::UnderscoreLifetime, kw::StaticLifetime].contains(&ident.name)`
	`1276`	`+ && ![sym::underscore_lifetime, kw::StaticLifetime].contains(&ident.name)`
`1277`	`1277`	`{`
`1278`	`1278`	`self.dcx().emit_err(errors::KeywordLifetime { span: ident.span });`
`1279`	`1279`	`}`