Skip to content

Commit 56043b7

Browse files
borsbors
committed
Auto merge of #60740 - petrochenkov:kw, r=nnethercote
Simplify use of keyword symbols They mirror non-keyword symbols now (see #60630). `keywords::MyKeyword.name()` -> `kw::MyKeyword` `keywords::MyKeyword.ident()` -> `Ident::with_empty_ctxt(kw::MyKeyword)` (not common) `keywords::Invalid.ident()` -> `Ident::invalid()` (more common) Keywords are simply `Symbol` constants now, the `Keyword` struct is eliminated. This means `kw::MyKeyword` can now be used in `match` in particular.
2 parents 80e7cde + 261eb01 commit 56043b7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+526
-554
lines changed

‎src/librustc/hir/lowering.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ use syntax::ptr::P;
6464
use syntax::source_map::{respan, CompilerDesugaringKind, Spanned};
6565
use syntax::source_map::CompilerDesugaringKind::IfTemporary;
6666
use syntax::std_inject;
67-
use syntax::symbol::{keywords, Symbol, sym};
67+
use syntax::symbol::{kw, sym, Symbol};
6868
use syntax::tokenstream::{TokenStream, TokenTree};
6969
use syntax::parse::token::Token;
7070
use syntax::visit::{self, Visitor};
@@ -926,11 +926,11 @@ impl<'a> LoweringContext<'a> {
926926
hir::LifetimeParamKind::InBand,
927927
),
928928
ParamName::Fresh(_) => (
929-
keywords::UnderscoreLifetime.name().as_interned_str(),
929+
kw::UnderscoreLifetime.as_interned_str(),
930930
hir::LifetimeParamKind::Elided,
931931
),
932932
ParamName::Error => (
933-
keywords::UnderscoreLifetime.name().as_interned_str(),
933+
kw::UnderscoreLifetime.as_interned_str(),
934934
hir::LifetimeParamKind::Error,
935935
),
936936
};
@@ -1414,7 +1414,7 @@ impl<'a> LoweringContext<'a> {
14141414
P(hir::Path {
14151415
res,
14161416
segments: hir_vec![hir::PathSegment::from_ident(
1417-
keywords::SelfUpper.ident()
1417+
Ident::with_empty_ctxt(kw::SelfUpper)
14181418
)],
14191419
span: t.span,
14201420
}),
@@ -1613,7 +1613,7 @@ impl<'a> LoweringContext<'a> {
16131613
trace!("registering existential type with id {:#?}", exist_ty_id);
16141614
let exist_ty_item = hir::Item {
16151615
hir_id: exist_ty_id,
1616-
ident: keywords::Invalid.ident(),
1616+
ident: Ident::invalid(),
16171617
attrs: Default::default(),
16181618
node: exist_ty_item_kind,
16191619
vis: respan(span.shrink_to_lo(), hir::VisibilityKind::Inherited),
@@ -1746,7 +1746,7 @@ impl<'a> LoweringContext<'a> {
17461746

17471747
let (name, kind) = match name {
17481748
hir::LifetimeName::Underscore => (
1749-
hir::ParamName::Plain(keywords::UnderscoreLifetime.ident()),
1749+
hir::ParamName::Plain(Ident::with_empty_ctxt(kw::UnderscoreLifetime)),
17501750
hir::LifetimeParamKind::Elided,
17511751
),
17521752
hir::LifetimeName::Param(param_name) => (
@@ -2295,7 +2295,7 @@ impl<'a> LoweringContext<'a> {
22952295
.iter()
22962296
.map(|arg| match arg.pat.node {
22972297
PatKind::Ident(_, ident, _) => ident,
2298-
_ => Ident::new(keywords::Invalid.name(), arg.pat.span),
2298+
_ => Ident::new(kw::Invalid, arg.pat.span),
22992299
})
23002300
.collect()
23012301
}
@@ -2584,9 +2584,9 @@ impl<'a> LoweringContext<'a> {
25842584
fn lower_lifetime(&mut self, l: &Lifetime) -> hir::Lifetime {
25852585
let span = l.ident.span;
25862586
match l.ident {
2587-
ident if ident.name == keywords::StaticLifetime.name() =>
2587+
ident if ident.name == kw::StaticLifetime =>
25882588
self.new_named_lifetime(l.id, span, hir::LifetimeName::Static),
2589-
ident if ident.name == keywords::UnderscoreLifetime.name() =>
2589+
ident if ident.name == kw::UnderscoreLifetime =>
25902590
match self.anonymous_lifetime_mode {
25912591
AnonymousLifetimeMode::CreateParameter => {
25922592
let fresh_name = self.collect_fresh_in_band_lifetime(span);
@@ -2708,7 +2708,7 @@ impl<'a> LoweringContext<'a> {
27082708
// Don't expose `Self` (recovered "keyword used as ident" parse error).
27092709
// `rustc::ty` expects `Self` to be only used for a trait's `Self`.
27102710
// Instead, use `gensym("Self")` to create a distinct name that looks the same.
2711-
let ident = if param.ident.name == keywords::SelfUpper.name() {
2711+
let ident = if param.ident.name == kw::SelfUpper {
27122712
param.ident.gensym()
27132713
} else {
27142714
param.ident
@@ -3323,7 +3323,7 @@ impl<'a> LoweringContext<'a> {
33233323

33243324
// Correctly resolve `self` imports.
33253325
if path.segments.len() > 1
3326-
&& path.segments.last().unwrap().ident.name == keywords::SelfLower.name()
3326+
&& path.segments.last().unwrap().ident.name == kw::SelfLower
33273327
{
33283328
let _ = path.segments.pop();
33293329
if rename.is_none() {

‎src/librustc/hir/map/def_collector.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::session::CrateDisambiguator;
55
use syntax::ast::*;
66
use syntax::ext::hygiene::Mark;
77
use syntax::visit;
8-
use syntax::symbol::keywords;
8+
use syntax::symbol::kw;
99
use syntax::symbol::Symbol;
1010
use syntax::parse::token::{self, Token};
1111
use syntax_pos::Span;
@@ -138,7 +138,7 @@ impl<'a> visit::Visitor<'a> for DefCollector<'a> {
138138
// information we encapsulate into, the better
139139
let def_data = match i.node {
140140
ItemKind::Impl(..) => DefPathData::Impl,
141-
ItemKind::Mod(..) if i.ident == keywords::Invalid.ident() => {
141+
ItemKind::Mod(..) if i.ident.name == kw::Invalid => {
142142
return visit::walk_item(self, i);
143143
}
144144
ItemKind::Mod(..) | ItemKind::Trait(..) | ItemKind::TraitAlias(..) |

‎src/librustc/hir/map/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ impl<'hir> Map<'hir> {
519519
pub fn ty_param_name(&self, id: HirId) -> Name {
520520
match self.get_by_hir_id(id) {
521521
Node::Item(&Item { node: ItemKind::Trait(..), .. }) |
522-
Node::Item(&Item { node: ItemKind::TraitAlias(..), .. }) => keywords::SelfUpper.name(),
522+
Node::Item(&Item { node: ItemKind::TraitAlias(..), .. }) => kw::SelfUpper,
523523
Node::GenericParam(param) => param.name.ident().name,
524524
_ => bug!("ty_param_name: {} not a type parameter", self.hir_to_string(id)),
525525
}

‎src/librustc/hir/mod.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use syntax::ast::{Attribute, Label, LitKind, StrStyle, FloatTy, IntTy, UintTy};
2424
use syntax::attr::{InlineAttr, OptimizeAttr};
2525
use syntax::ext::hygiene::SyntaxContext;
2626
use syntax::ptr::P;
27-
use syntax::symbol::{Symbol, keywords};
27+
use syntax::symbol::{Symbol, kw};
2828
use syntax::tokenstream::TokenStream;
2929
use syntax::util::parser::ExprPrecedence;
3030
use crate::ty::AdtKind;
@@ -160,7 +160,7 @@ pub struct Lifetime {
160160
pub span: Span,
161161

162162
/// Either "`'a`", referring to a named lifetime definition,
163-
/// or "``" (i.e., `keywords::Invalid`), for elision placeholders.
163+
/// or "``" (i.e., `kw::Invalid`), for elision placeholders.
164164
///
165165
/// HIR lowering inserts these placeholders in type paths that
166166
/// refer to type definitions needing lifetime parameters,
@@ -199,7 +199,8 @@ impl ParamName {
199199
pub fn ident(&self) -> Ident {
200200
match *self {
201201
ParamName::Plain(ident) => ident,
202-
ParamName::Error | ParamName::Fresh(_) => keywords::UnderscoreLifetime.ident(),
202+
ParamName::Fresh(_) |
203+
ParamName::Error => Ident::with_empty_ctxt(kw::UnderscoreLifetime),
203204
}
204205
}
205206

@@ -233,10 +234,9 @@ pub enum LifetimeName {
233234
impl LifetimeName {
234235
pub fn ident(&self) -> Ident {
235236
match *self {
236-
LifetimeName::Implicit => keywords::Invalid.ident(),
237-
LifetimeName::Error => keywords::Invalid.ident(),
238-
LifetimeName::Underscore => keywords::UnderscoreLifetime.ident(),
239-
LifetimeName::Static => keywords::StaticLifetime.ident(),
237+
LifetimeName::Implicit | LifetimeName::Error => Ident::invalid(),
238+
LifetimeName::Underscore => Ident::with_empty_ctxt(kw::UnderscoreLifetime),
239+
LifetimeName::Static => Ident::with_empty_ctxt(kw::StaticLifetime),
240240
LifetimeName::Param(param_name) => param_name.ident(),
241241
}
242242
}
@@ -305,7 +305,7 @@ pub struct Path {
305305

306306
impl Path {
307307
pub fn is_global(&self) -> bool {
308-
!self.segments.is_empty() && self.segments[0].ident.name == keywords::PathRoot.name()
308+
!self.segments.is_empty() && self.segments[0].ident.name == kw::PathRoot
309309
}
310310
}
311311

‎src/librustc/hir/print.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use syntax::print::pp::{self, Breaks};
77
use syntax::print::pp::Breaks::{Consistent, Inconsistent};
88
use syntax::print::pprust::{self, PrintState};
99
use syntax::ptr::P;
10-
use syntax::symbol::keywords;
10+
use syntax::symbol::kw;
1111
use syntax::util::parser::{self, AssocOp, Fixity};
1212
use syntax_pos::{self, BytePos, FileName};
1313

@@ -798,7 +798,7 @@ impl<'a> State<'a> {
798798
hir::VisibilityKind::Restricted { ref path, .. } => {
799799
self.s.word("pub(")?;
800800
if path.segments.len() == 1 &&
801-
path.segments[0].ident.name == keywords::Super.name() {
801+
path.segments[0].ident.name == kw::Super {
802802
// Special case: `super` can print like `pub(super)`.
803803
self.s.word("super")?;
804804
} else {
@@ -1559,7 +1559,7 @@ impl<'a> State<'a> {
15591559
if i > 0 {
15601560
self.s.word("::")?
15611561
}
1562-
if segment.ident.name != keywords::PathRoot.name() {
1562+
if segment.ident.name != kw::PathRoot {
15631563
self.print_ident(segment.ident)?;
15641564
segment.with_generic_args(|generic_args| {
15651565
self.print_generic_args(generic_args, segment.infer_types,
@@ -1572,7 +1572,7 @@ impl<'a> State<'a> {
15721572
}
15731573

15741574
pub fn print_path_segment(&mut self, segment: &hir::PathSegment) -> io::Result<()> {
1575-
if segment.ident.name != keywords::PathRoot.name() {
1575+
if segment.ident.name != kw::PathRoot {
15761576
self.print_ident(segment.ident)?;
15771577
segment.with_generic_args(|generic_args| {
15781578
self.print_generic_args(generic_args, segment.infer_types, false)
@@ -1599,7 +1599,7 @@ impl<'a> State<'a> {
15991599
if i > 0 {
16001600
self.s.word("::")?
16011601
}
1602-
if segment.ident.name != keywords::PathRoot.name() {
1602+
if segment.ident.name != kw::PathRoot {
16031603
self.print_ident(segment.ident)?;
16041604
segment.with_generic_args(|generic_args| {
16051605
self.print_generic_args(generic_args,

‎src/librustc/middle/liveness.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ use std::io;
112112
use std::rc::Rc;
113113
use syntax::ast::{self, NodeId};
114114
use syntax::ptr::P;
115-
use syntax::symbol::{keywords, sym};
115+
use syntax::symbol::{kw, sym};
116116
use syntax_pos::Span;
117117

118118
use crate::hir;
@@ -1552,7 +1552,7 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
15521552
let sp = ident.span;
15531553
let var = self.variable(hir_id, sp);
15541554
// Ignore unused self.
1555-
if ident.name != keywords::SelfLower.name() {
1555+
if ident.name != kw::SelfLower {
15561556
if !self.warn_about_unused(vec![sp], hir_id, entry_ln, var) {
15571557
if self.live_on_entry(entry_ln, var).is_none() {
15581558
self.report_dead_assign(hir_id, sp, var, true);

‎src/librustc/middle/resolve_lifetime.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use std::mem::replace;
2323
use syntax::ast;
2424
use syntax::attr;
2525
use syntax::ptr::P;
26-
use syntax::symbol::{keywords, sym};
26+
use syntax::symbol::{kw, sym};
2727
use syntax_pos::Span;
2828

2929
use crate::hir::intravisit::{self, NestedVisitorMap, Visitor};
@@ -711,7 +711,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
711711
GenericParamKind::Lifetime { .. } => {
712712
let (name, reg) = Region::early(&self.tcx.hir(), &mut index, &param);
713713
if let hir::ParamName::Plain(param_name) = name {
714-
if param_name.name == keywords::UnderscoreLifetime.name() {
714+
if param_name.name == kw::UnderscoreLifetime {
715715
// Pick the elided lifetime "definition" if one exists
716716
// and use it to make an elision scope.
717717
elision = Some(reg);
@@ -1602,7 +1602,7 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
16021602
} {
16031603
debug!("id = {:?} span = {:?} name = {:?}", id, span, name);
16041604

1605-
if name == keywords::UnderscoreLifetime.ident() {
1605+
if name.name == kw::UnderscoreLifetime {
16061606
continue;
16071607
}
16081608

@@ -2525,8 +2525,8 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
25252525
for (i, (lifetime_i, lifetime_i_name)) in lifetimes.iter().enumerate() {
25262526
if let hir::ParamName::Plain(_) = lifetime_i_name {
25272527
let name = lifetime_i_name.ident().name;
2528-
if name == keywords::UnderscoreLifetime.name()
2529-
|| name == keywords::StaticLifetime.name()
2528+
if name == kw::UnderscoreLifetime
2529+
|| name == kw::StaticLifetime
25302530
{
25312531
let mut err = struct_span_err!(
25322532
self.tcx.sess,

‎src/librustc/ty/context.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ use syntax::ast;
7474
use syntax::attr;
7575
use syntax::source_map::MultiSpan;
7676
use syntax::feature_gate;
77-
use syntax::symbol::{Symbol, keywords, InternedString, sym};
77+
use syntax::symbol::{Symbol, InternedString, kw, sym};
7878
use syntax_pos::Span;
7979

8080
use crate::hir;
@@ -2735,7 +2735,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
27352735

27362736
#[inline]
27372737
pub fn mk_self_type(self) -> Ty<'tcx> {
2738-
self.mk_ty_param(0, keywords::SelfUpper.name().as_interned_str())
2738+
self.mk_ty_param(0, kw::SelfUpper.as_interned_str())
27392739
}
27402740

27412741
pub fn mk_param_from_def(self, param: &ty::GenericParamDef) -> Kind<'tcx> {

‎src/librustc/ty/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ use std::ops::Range;
4747
use syntax::ast::{self, Name, Ident, NodeId};
4848
use syntax::attr;
4949
use syntax::ext::hygiene::Mark;
50-
use syntax::symbol::{keywords, sym, Symbol, LocalInternedString, InternedString};
50+
use syntax::symbol::{kw, sym, Symbol, LocalInternedString, InternedString};
5151
use syntax_pos::Span;
5252

5353
use smallvec;
@@ -835,7 +835,7 @@ impl ty::EarlyBoundRegion {
835835
/// Does this early bound region have a name? Early bound regions normally
836836
/// always have names except when using anonymous lifetimes (`'_`).
837837
pub fn has_name(&self) -> bool {
838-
self.name != keywords::UnderscoreLifetime.name().as_interned_str()
838+
self.name != kw::UnderscoreLifetime.as_interned_str()
839839
}
840840
}
841841

‎src/librustc/ty/print/pretty.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::middle::region;
77
use crate::ty::{self, DefIdTree, ParamConst, Ty, TyCtxt, TypeFoldable};
88
use crate::ty::subst::{Kind, Subst, UnpackedKind};
99
use crate::mir::interpret::ConstValue;
10-
use syntax::symbol::{keywords, Symbol};
10+
use syntax::symbol::{kw, Symbol};
1111

1212
use rustc_target::spec::abi::Abi;
1313
use syntax::symbol::InternedString;
@@ -982,7 +982,7 @@ impl<F: fmt::Write> Printer<'gcx, 'tcx> for FmtPrinter<'_, 'gcx, 'tcx, F> {
982982
if self.tcx.sess.rust_2018() {
983983
// We add the `crate::` keyword on Rust 2018, only when desired.
984984
if SHOULD_PREFIX_WITH_CRATE.with(|flag| flag.get()) {
985-
write!(self, "{}", keywords::Crate.name())?;
985+
write!(self, "{}", kw::Crate)?;
986986
self.empty_path = false;
987987
}
988988
}

‎src/librustc/ty/sty.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use std::marker::PhantomData;
2222
use std::ops::Range;
2323
use rustc_target::spec::abi;
2424
use syntax::ast::{self, Ident};
25-
use syntax::symbol::{keywords, InternedString};
25+
use syntax::symbol::{kw, InternedString};
2626

2727
use serialize;
2828
use self::InferTy::*;
@@ -1121,7 +1121,7 @@ impl<'a, 'gcx, 'tcx> ParamTy {
11211121
}
11221122

11231123
pub fn for_self() -> ParamTy {
1124-
ParamTy::new(0, keywords::SelfUpper.name().as_interned_str())
1124+
ParamTy::new(0, kw::SelfUpper.as_interned_str())
11251125
}
11261126

11271127
pub fn for_def(def: &ty::GenericParamDef) -> ParamTy {
@@ -1136,7 +1136,7 @@ impl<'a, 'gcx, 'tcx> ParamTy {
11361136
// FIXME(#50125): Ignoring `Self` with `index != 0` might lead to weird behavior elsewhere,
11371137
// but this should only be possible when using `-Z continue-parse-after-error` like
11381138
// `compile-fail/issue-36638.rs`.
1139-
self.name == keywords::SelfUpper.name().as_str() && self.index == 0
1139+
self.name == kw::SelfUpper.as_str() && self.index == 0
11401140
}
11411141
}
11421142

‎src/librustc_codegen_ssa/mir/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use crate::debuginfo::{self, VariableAccess, VariableKind, FunctionDebugContext}
1010
use crate::traits::*;
1111

1212
use syntax_pos::{DUMMY_SP, NO_EXPANSION, BytePos, Span};
13-
use syntax::symbol::keywords;
13+
use syntax::symbol::kw;
1414

1515
use std::iter;
1616

@@ -496,7 +496,7 @@ fn arg_local_refs<'a, 'tcx: 'a, Bx: BuilderMethods<'a, 'tcx>>(
496496
};
497497
bx.declare_local(
498498
&fx.debug_context,
499-
arg_decl.name.unwrap_or(keywords::Invalid.name()),
499+
arg_decl.name.unwrap_or(kw::Invalid),
500500
arg_ty, scope,
501501
variable_access,
502502
VariableKind::ArgumentVariable(arg_index + 1),
@@ -613,7 +613,7 @@ fn arg_local_refs<'a, 'tcx: 'a, Bx: BuilderMethods<'a, 'tcx>>(
613613

614614
bx.declare_local(
615615
&fx.debug_context,
616-
arg_decl.name.unwrap_or(keywords::Invalid.name()),
616+
arg_decl.name.unwrap_or(kw::Invalid),
617617
arg.layout.ty,
618618
scope,
619619
variable_access,

‎src/librustc_lint/builtin.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ use syntax::edition::Edition;
4242
use syntax::feature_gate::{AttributeGate, AttributeTemplate, AttributeType};
4343
use syntax::feature_gate::{Stability, deprecated_attributes};
4444
use syntax_pos::{BytePos, Span, SyntaxContext};
45-
use syntax::symbol::{Symbol, keywords, sym};
45+
use syntax::symbol::{Symbol, kw, sym};
4646
use syntax::errors::{Applicability, DiagnosticBuilder};
4747
use syntax::print::pprust::expr_to_string;
4848
use syntax::visit::FnKind;
@@ -607,7 +607,7 @@ impl EarlyLintPass for AnonymousParameters {
607607
for arg in sig.decl.inputs.iter() {
608608
match arg.pat.node {
609609
ast::PatKind::Ident(_, ident, None) => {
610-
if ident.name == keywords::Invalid.name() {
610+
if ident.name == kw::Invalid {
611611
let ty_snip = cx
612612
.sess
613613
.source_map()

0 commit comments

Comments
 (0)