Skip to content

Commit 0defc4f

Browse files
matthiaskrgrmatthiaskrgr
authored
Rollup merge of rust-lang#137977 - nnethercote:less-kw-Empty-1, r=spastorino
Reduce `kw::Empty` usage, part 1 This PR fixes some confusing `kw::Empty` usage, fixing a crash test along the way. r? ```@spastorino```
2 parents 63c548d + af92a33 commit 0defc4f

File tree

19 files changed

+125
-83
lines changed

19 files changed

+125
-83
lines changed

Diff for: ‎compiler/rustc_ast_lowering/src/expr.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use rustc_middle::span_bug;
1313
use rustc_middle::ty::TyCtxt;
1414
use rustc_session::errors::report_lit_error;
1515
use rustc_span::source_map::{Spanned, respan};
16-
use rustc_span::{DUMMY_SP, DesugaringKind, Ident, Span, Symbol, kw, sym};
16+
use rustc_span::{DUMMY_SP, DesugaringKind, Ident, Span, Symbol, sym};
1717
use thin_vec::{ThinVec, thin_vec};
1818
use visit::{Visitor, walk_expr};
1919

@@ -484,7 +484,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
484484
if legacy_args_idx.contains(&idx) {
485485
let parent_def_id = self.current_hir_id_owner.def_id;
486486
let node_id = self.next_node_id();
487-
self.create_def(parent_def_id, node_id, kw::Empty, DefKind::AnonConst, f.span);
487+
self.create_def(parent_def_id, node_id, None, DefKind::AnonConst, f.span);
488488
let mut visitor = WillCreateDefIdsVisitor {};
489489
let const_value = if let ControlFlow::Break(span) = visitor.visit_expr(&arg) {
490490
AstP(Expr {

Diff for: ‎compiler/rustc_ast_lowering/src/lib.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
494494
&mut self,
495495
parent: LocalDefId,
496496
node_id: ast::NodeId,
497-
name: Symbol,
497+
name: Option<Symbol>,
498498
def_kind: DefKind,
499499
span: Span,
500500
) -> LocalDefId {
@@ -774,7 +774,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
774774
let _def_id = self.create_def(
775775
self.current_hir_id_owner.def_id,
776776
param,
777-
kw::UnderscoreLifetime,
777+
Some(kw::UnderscoreLifetime),
778778
DefKind::LifetimeParam,
779779
ident.span,
780780
);
@@ -2089,8 +2089,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
20892089
// We're lowering a const argument that was originally thought to be a type argument,
20902090
// so the def collector didn't create the def ahead of time. That's why we have to do
20912091
// it here.
2092-
let def_id =
2093-
self.create_def(parent_def_id, node_id, kw::Empty, DefKind::AnonConst, span);
2092+
let def_id = self.create_def(parent_def_id, node_id, None, DefKind::AnonConst, span);
20942093
let hir_id = self.lower_node_id(node_id);
20952094

20962095
let path_expr = Expr {

Diff for: ‎compiler/rustc_ast_lowering/src/pat.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use rustc_hir::def::{DefKind, Res};
77
use rustc_hir::{self as hir, LangItem};
88
use rustc_middle::span_bug;
99
use rustc_span::source_map::{Spanned, respan};
10-
use rustc_span::{DesugaringKind, Ident, Span, kw};
10+
use rustc_span::{DesugaringKind, Ident, Span};
1111

1212
use super::errors::{
1313
ArbitraryExpressionInPattern, ExtraDoubleDot, MisplacedDoubleDot, SubTupleBinding,
@@ -523,7 +523,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
523523
// We're generating a range end that didn't exist in the AST,
524524
// so the def collector didn't create the def ahead of time. That's why we have to do
525525
// it here.
526-
let def_id = self.create_def(parent_def_id, node_id, kw::Empty, DefKind::AnonConst, span);
526+
let def_id = self.create_def(parent_def_id, node_id, None, DefKind::AnonConst, span);
527527
let hir_id = self.lower_node_id(node_id);
528528

529529
let unstable_span = self.mark_span_with_reason(

Diff for: ‎compiler/rustc_const_eval/src/interpret/intern.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ fn intern_as_new_static<'tcx>(
104104
) {
105105
let feed = tcx.create_def(
106106
static_id,
107-
sym::nested,
107+
Some(sym::nested),
108108
DefKind::Static { safety: hir::Safety::Safe, mutability: alloc.0.mutability, nested: true },
109109
);
110110
tcx.set_nested_alloc_id_static(alloc_id, feed.def_id());

Diff for: ‎compiler/rustc_hir/src/def.rs

+12-6
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,9 @@ impl DefKind {
253253
}
254254
}
255255

256-
pub fn def_path_data(self, name: Symbol) -> DefPathData {
256+
// Some `DefKind`s require a name, some don't. Panics if one is needed but
257+
// not provided. (`AssocTy` is an exception, see below.)
258+
pub fn def_path_data(self, name: Option<Symbol>) -> DefPathData {
257259
match self {
258260
DefKind::Mod
259261
| DefKind::Struct
@@ -264,9 +266,13 @@ impl DefKind {
264266
| DefKind::TyAlias
265267
| DefKind::ForeignTy
266268
| DefKind::TraitAlias
267-
| DefKind::AssocTy
268269
| DefKind::TyParam
269-
| DefKind::ExternCrate => DefPathData::TypeNs(name),
270+
| DefKind::ExternCrate => DefPathData::TypeNs(Some(name.unwrap())),
271+
272+
// An associated type names will be missing for an RPITIT. It will
273+
// later be given a name with `synthetic` in it, if necessary.
274+
DefKind::AssocTy => DefPathData::TypeNs(name),
275+
270276
// It's not exactly an anon const, but wrt DefPathData, there
271277
// is no difference.
272278
DefKind::Static { nested: true, .. } => DefPathData::AnonConst,
@@ -276,9 +282,9 @@ impl DefKind {
276282
| DefKind::Static { .. }
277283
| DefKind::AssocFn
278284
| DefKind::AssocConst
279-
| DefKind::Field => DefPathData::ValueNs(name),
280-
DefKind::Macro(..) => DefPathData::MacroNs(name),
281-
DefKind::LifetimeParam => DefPathData::LifetimeNs(name),
285+
| DefKind::Field => DefPathData::ValueNs(name.unwrap()),
286+
DefKind::Macro(..) => DefPathData::MacroNs(name.unwrap()),
287+
DefKind::LifetimeParam => DefPathData::LifetimeNs(name.unwrap()),
282288
DefKind::Ctor(..) => DefPathData::Ctor,
283289
DefKind::Use => DefPathData::Use,
284290
DefKind::ForeignMod => DefPathData::ForeignMod,

Diff for: ‎compiler/rustc_hir/src/definitions.rs

+13-9
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,9 @@ pub enum DefPathData {
271271
Use,
272272
/// A global asm item.
273273
GlobalAsm,
274-
/// Something in the type namespace.
275-
TypeNs(Symbol),
274+
/// Something in the type namespace. Will be empty for RPITIT associated
275+
/// types, which are given a synthetic name later, if necessary.
276+
TypeNs(Option<Symbol>),
276277
/// Something in the value namespace.
277278
ValueNs(Symbol),
278279
/// Something in the macro namespace.
@@ -410,8 +411,9 @@ impl DefPathData {
410411
pub fn get_opt_name(&self) -> Option<Symbol> {
411412
use self::DefPathData::*;
412413
match *self {
413-
TypeNs(name) if name == kw::Empty => None,
414-
TypeNs(name) | ValueNs(name) | MacroNs(name) | LifetimeNs(name) => Some(name),
414+
TypeNs(name) => name,
415+
416+
ValueNs(name) | MacroNs(name) | LifetimeNs(name) => Some(name),
415417

416418
Impl | ForeignMod | CrateRoot | Use | GlobalAsm | Closure | Ctor | AnonConst
417419
| OpaqueTy => None,
@@ -421,12 +423,14 @@ impl DefPathData {
421423
pub fn name(&self) -> DefPathDataName {
422424
use self::DefPathData::*;
423425
match *self {
424-
TypeNs(name) if name == kw::Empty => {
425-
DefPathDataName::Anon { namespace: sym::synthetic }
426-
}
427-
TypeNs(name) | ValueNs(name) | MacroNs(name) | LifetimeNs(name) => {
428-
DefPathDataName::Named(name)
426+
TypeNs(name) => {
427+
if let Some(name) = name {
428+
DefPathDataName::Named(name)
429+
} else {
430+
DefPathDataName::Anon { namespace: sym::synthetic }
431+
}
429432
}
433+
ValueNs(name) | MacroNs(name) | LifetimeNs(name) => DefPathDataName::Named(name),
430434
// Note that this does not show up in user print-outs.
431435
CrateRoot => DefPathDataName::Anon { namespace: kw::Crate },
432436
Impl => DefPathDataName::Anon { namespace: kw::Impl },

Diff for: ‎compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1462,7 +1462,8 @@ impl<'a, 'tcx> BoundVarContext<'a, 'tcx> {
14621462
for &(opaque_def_id, captures) in opaque_capture_scopes.iter().rev() {
14631463
let mut captures = captures.borrow_mut();
14641464
let remapped = *captures.entry(lifetime).or_insert_with(|| {
1465-
let feed = self.tcx.create_def(opaque_def_id, ident.name, DefKind::LifetimeParam);
1465+
let feed =
1466+
self.tcx.create_def(opaque_def_id, Some(ident.name), DefKind::LifetimeParam);
14661467
feed.def_span(ident.span);
14671468
feed.def_ident_span(Some(ident.span));
14681469
feed.def_id()

Diff for: ‎compiler/rustc_middle/src/ty/context.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1890,7 +1890,7 @@ impl<'tcx> TyCtxtAt<'tcx> {
18901890
pub fn create_def(
18911891
self,
18921892
parent: LocalDefId,
1893-
name: Symbol,
1893+
name: Option<Symbol>,
18941894
def_kind: DefKind,
18951895
) -> TyCtxtFeed<'tcx, LocalDefId> {
18961896
let feed = self.tcx.create_def(parent, name, def_kind);
@@ -1905,7 +1905,7 @@ impl<'tcx> TyCtxt<'tcx> {
19051905
pub fn create_def(
19061906
self,
19071907
parent: LocalDefId,
1908-
name: Symbol,
1908+
name: Option<Symbol>,
19091909
def_kind: DefKind,
19101910
) -> TyCtxtFeed<'tcx, LocalDefId> {
19111911
let data = def_kind.def_path_data(name);

Diff for: ‎compiler/rustc_middle/src/ty/print/pretty.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {
569569
// the children of the visible parent (as was done when computing
570570
// `visible_parent_map`), looking for the specific child we currently have and then
571571
// have access to the re-exported name.
572-
DefPathData::TypeNs(ref mut name) if Some(visible_parent) != actual_parent => {
572+
DefPathData::TypeNs(Some(ref mut name)) if Some(visible_parent) != actual_parent => {
573573
// Item might be re-exported several times, but filter for the one
574574
// that's public and whose identifier isn't `_`.
575575
let reexport = self
@@ -590,7 +590,7 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {
590590
}
591591
// Re-exported `extern crate` (#43189).
592592
DefPathData::CrateRoot => {
593-
data = DefPathData::TypeNs(self.tcx().crate_name(def_id.krate));
593+
data = DefPathData::TypeNs(Some(self.tcx().crate_name(def_id.krate)));
594594
}
595595
_ => {}
596596
}

Diff for: ‎compiler/rustc_middle/src/ty/significant_drop_order.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@ fn true_significant_drop_ty<'tcx>(
2323

2424
match key.disambiguated_data.data {
2525
rustc_hir::definitions::DefPathData::CrateRoot => {
26-
name_rev.push(tcx.crate_name(did.krate))
26+
name_rev.push(tcx.crate_name(did.krate));
27+
}
28+
rustc_hir::definitions::DefPathData::TypeNs(symbol) => {
29+
name_rev.push(symbol.unwrap());
2730
}
28-
rustc_hir::definitions::DefPathData::TypeNs(symbol) => name_rev.push(symbol),
2931
_ => return None,
3032
}
3133
if let Some(parent) = key.parent {

Diff for: ‎compiler/rustc_mir_transform/src/coroutine/by_move_body.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ use rustc_middle::hir::place::{Projection, ProjectionKind};
7878
use rustc_middle::mir::visit::MutVisitor;
7979
use rustc_middle::mir::{self, dump_mir};
8080
use rustc_middle::ty::{self, InstanceKind, Ty, TyCtxt, TypeVisitableExt};
81-
use rustc_span::kw;
8281

8382
pub(crate) fn coroutine_by_move_body_def_id<'tcx>(
8483
tcx: TyCtxt<'tcx>,
@@ -214,7 +213,7 @@ pub(crate) fn coroutine_by_move_body_def_id<'tcx>(
214213
MakeByMoveBody { tcx, field_remapping, by_move_coroutine_ty }.visit_body(&mut by_move_body);
215214

216215
// This will always be `{closure#1}`, since the original coroutine is `{closure#0}`.
217-
let body_def = tcx.create_def(parent_def_id, kw::Empty, DefKind::SyntheticCoroutineBody);
216+
let body_def = tcx.create_def(parent_def_id, None, DefKind::SyntheticCoroutineBody);
218217
by_move_body.source =
219218
mir::MirSource::from_instance(InstanceKind::Item(body_def.def_id().to_def_id()));
220219
dump_mir(tcx, false, "built", &"after", &by_move_body, |_, _| Ok(()));

0 commit comments

Comments
 (0)