XXX: kw::Empty

Author: nnethercote

compiler/rustc_ast_lowering/src/asm.rs

@@ -7,7 +7,6 @@ use rustc_data_structures::fx::{FxHashMap, FxHashSet, FxIndexMap};
 use rustc_hir as hir;
 use rustc_hir::def::{DefKind, Res};
 use rustc_session::parse::feature_err;
-use rustc_span::symbol::kw;
 use rustc_span::{Span, sym};
 use rustc_target::asm;
 
@@ -232,7 +231,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
                             self.create_def(
                                 parent_def_id,
                                 node_id,
-                                kw::Empty,
+                                sym::empty,
                                 DefKind::AnonConst,
                                 *op_sp,
                             );

compiler/rustc_ast_lowering/src/expr.rs

@@ -13,7 +13,7 @@ use rustc_middle::span_bug;
 use rustc_middle::ty::TyCtxt;
 use rustc_session::errors::report_lit_error;
 use rustc_span::source_map::{Spanned, respan};
-use rustc_span::symbol::{Ident, Symbol, kw, sym};
+use rustc_span::symbol::{Ident, Symbol, sym};
 use rustc_span::{DUMMY_SP, DesugaringKind, Span};
 use thin_vec::{ThinVec, thin_vec};
 use visit::{Visitor, walk_expr};
@@ -449,7 +449,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
             if legacy_args_idx.contains(&idx) {
                 let parent_def_id = self.current_hir_id_owner.def_id;
                 let node_id = self.next_node_id();
-                self.create_def(parent_def_id, node_id, kw::Empty, DefKind::AnonConst, f.span);
+                self.create_def(parent_def_id, node_id, sym::empty, DefKind::AnonConst, f.span);
                 let mut visitor = WillCreateDefIdsVisitor {};
                 let const_value = if let ControlFlow::Break(span) = visitor.visit_expr(&arg) {
                     AstP(Expr {

compiler/rustc_ast_lowering/src/format.rs

@@ -6,7 +6,7 @@ use rustc_ast::*;
 use rustc_data_structures::fx::FxIndexMap;
 use rustc_hir as hir;
 use rustc_session::config::FmtDebug;
-use rustc_span::symbol::{Ident, kw};
+use rustc_span::symbol::Ident;
 use rustc_span::{Span, Symbol, sym};
 
 use super::LoweringContext;
@@ -416,7 +416,7 @@ fn expand_format_args<'hir>(
                 &FormatArgsPiece::Placeholder(_) => {
                     // Inject empty string before placeholders when not already preceded by a literal piece.
                     if i == 0 || matches!(fmt.template[i - 1], FormatArgsPiece::Placeholder(_)) {
-                        Some(ctx.expr_str(fmt.span, kw::Empty))
+                        Some(ctx.expr_str(fmt.span, sym::empty))
                     } else {
                         None
                     }

compiler/rustc_ast_lowering/src/lib.rs

@@ -900,7 +900,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
                 } else {
                     let guar = self.dcx().has_errors().unwrap();
                     MetaItemLit {
-                        symbol: kw::Empty,
+                        symbol: sym::empty,
                         suffix: None,
                         kind: LitKind::Err(guar),
                         span: DUMMY_SP,
@@ -1485,7 +1485,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
     fn lower_fn_params_to_names(&mut self, decl: &FnDecl) -> &'hir [Ident] {
         self.arena.alloc_from_iter(decl.inputs.iter().map(|param| match param.pat.kind {
             PatKind::Ident(_, ident, _) => self.lower_ident(ident),
-            _ => Ident::new(kw::Empty, self.lower_span(param.pat.span)),
+            _ => Ident::new(sym::empty, self.lower_span(param.pat.span)),
         }))
     }
 
@@ -2069,7 +2069,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
             // so the def collector didn't create the def ahead of time. That's why we have to do
             // it here.
             let def_id =
-                self.create_def(parent_def_id, node_id, kw::Empty, DefKind::AnonConst, span);
+                self.create_def(parent_def_id, node_id, sym::empty, DefKind::AnonConst, span);
             let hir_id = self.lower_node_id(node_id);
 
             let path_expr = Expr {
@@ -2365,7 +2365,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
     fn elided_dyn_bound(&mut self, span: Span) -> &'hir hir::Lifetime {
         let r = hir::Lifetime {
             hir_id: self.next_id(),
-            ident: Ident::new(kw::Empty, self.lower_span(span)),
+            ident: Ident::new(sym::empty, self.lower_span(span)),
             res: hir::LifetimeName::ImplicitObjectLifetimeDefault,
         };
         debug!("elided_dyn_bound: r={:?}", r);

compiler/rustc_ast_lowering/src/path.rs

@@ -6,7 +6,7 @@ use rustc_hir::def::{DefKind, PartialRes, Res};
 use rustc_hir::def_id::DefId;
 use rustc_middle::span_bug;
 use rustc_session::parse::add_feature_diagnostics;
-use rustc_span::symbol::{Ident, kw, sym};
+use rustc_span::symbol::{Ident, sym};
 use rustc_span::{BytePos, DUMMY_SP, DesugaringKind, Span, Symbol};
 use smallvec::{SmallVec, smallvec};
 use tracing::{debug, instrument};
@@ -445,7 +445,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
                 let id = NodeId::from_u32(i);
                 let l = self.lower_lifetime(&Lifetime {
                     id,
-                    ident: Ident::new(kw::Empty, elided_lifetime_span),
+                    ident: Ident::new(sym::empty, elided_lifetime_span),
                 });
                 GenericArg::Lifetime(l)
             }),

compiler/rustc_ast_pretty/src/pprust/state.rs

@@ -1901,7 +1901,7 @@ impl<'a> State<'a> {
                     self.print_explicit_self(&eself);
                 } else {
                     let invalid = if let PatKind::Ident(_, ident, _) = input.pat.kind {
-                        ident.name == kw::Empty
+                        ident.name == sym::empty
                     } else {
                         false
                     };

compiler/rustc_borrowck/src/diagnostics/region_errors.rs

@@ -895,7 +895,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
                     // Skip `async` desugaring `impl Future`.
                 }
                 if let TyKind::TraitObject(_, lt, _) = alias_ty.kind {
-                    if lt.ident.name == kw::Empty {
+                    if lt.ident.name == sym::empty {
                         spans_suggs.push((lt.ident.span.shrink_to_hi(), " + 'a".to_string()));
                     } else {
                         spans_suggs.push((lt.ident.span, "'a".to_string()));

compiler/rustc_codegen_ssa/src/mir/debuginfo.rs

@@ -10,7 +10,7 @@ use rustc_middle::ty::layout::{LayoutOf, TyAndLayout};
 use rustc_middle::ty::{Instance, Ty};
 use rustc_middle::{bug, mir, ty};
 use rustc_session::config::DebugInfo;
-use rustc_span::symbol::{Symbol, kw};
+use rustc_span::symbol::{Symbol, sym};
 use rustc_span::{BytePos, Span, hygiene};
 
 use super::operand::{OperandRef, OperandValue};
@@ -286,7 +286,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
                 // (after #67586 gets fixed).
                 None
             } else {
-                let name = kw::Empty;
+                let name = sym::empty;
                 let decl = &self.mir.local_decls[local];
                 let dbg_var = if full_debug_info {
                     self.adjusted_span_and_dbg_scope(decl.source_info).map(
@@ -321,7 +321,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
             None
         } else {
             Some(match whole_local_var.or(fallback_var.clone()) {
-                Some(var) if var.name != kw::Empty => var.name.to_string(),
+                Some(var) if var.name != sym::empty => var.name.to_string(),
                 _ => format!("{local:?}"),
             })
         };

compiler/rustc_hir/src/definitions.rs

@@ -409,7 +409,7 @@ impl DefPathData {
     pub fn get_opt_name(&self) -> Option<Symbol> {
         use self::DefPathData::*;
         match *self {
-            TypeNs(name) if name == kw::Empty => None,
+            TypeNs(name) if name == sym::empty => None,
             TypeNs(name) | ValueNs(name) | MacroNs(name) | LifetimeNs(name) => Some(name),
 
             Impl | ForeignMod | CrateRoot | Use | GlobalAsm | Closure | Ctor | AnonConst
@@ -420,7 +420,7 @@ impl DefPathData {
     pub fn name(&self) -> DefPathDataName {
         use self::DefPathData::*;
         match *self {
-            TypeNs(name) if name == kw::Empty => {
+            TypeNs(name) if name == sym::empty => {
                 DefPathDataName::Anon { namespace: sym::synthetic }
             }
             TypeNs(name) | ValueNs(name) | MacroNs(name) | LifetimeNs(name) => {

compiler/rustc_hir/src/hir.rs

@@ -35,7 +35,7 @@ pub struct Lifetime {
 
     /// Either "`'a`", referring to a named lifetime definition,
     /// `'_` referring to an anonymous lifetime (either explicitly `'_` or `&type`),
-    /// or "``" (i.e., `kw::Empty`) when appearing in path.
+    /// or "``" (i.e., `sym::empty`) when appearing in path.
     ///
     /// See `Lifetime::suggestion_position` for practical use.
     pub ident: Ident,
@@ -126,7 +126,7 @@ impl LifetimeName {
 
 impl fmt::Display for Lifetime {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        if self.ident.name != kw::Empty { self.ident.name.fmt(f) } else { "'_".fmt(f) }
+        if self.ident.name != sym::empty { self.ident.name.fmt(f) } else { "'_".fmt(f) }
     }
 }
 
@@ -149,11 +149,11 @@ impl Lifetime {
     }
 
     pub fn is_anonymous(&self) -> bool {
-        self.ident.name == kw::Empty || self.ident.name == sym::underscore_lifetime
+        self.ident.name == sym::empty || self.ident.name == sym::underscore_lifetime
     }
 
     pub fn suggestion_position(&self) -> (LifetimeSuggestionPosition, Span) {
-        if self.ident.name == kw::Empty {
+        if self.ident.name == sym::empty {
             if self.ident.span.is_empty() {
                 (LifetimeSuggestionPosition::ElidedPathArgument, self.ident.span)
             } else {