Skip to content

Commit 12747f1

Browse files
committed
Remove Resolver::empty_disambiguator.
It was added in #115367 for anonymous ADTs. Those changes were then reverted in #131045, but `empty_disambiguator` was left behind, perhaps by mistake. It seems to be unnecessary.
1 parent 66cc7d6 commit 12747f1

File tree

1 file changed

+0
-6
lines changed
  • compiler/rustc_resolve/src

1 file changed

+0
-6
lines changed

compiler/rustc_resolve/src/lib.rs

-6
Original file line numberDiff line numberDiff line change
@@ -1082,8 +1082,6 @@ pub struct Resolver<'ra, 'tcx> {
10821082
binding_parent_modules: FxHashMap<NameBinding<'ra>, Module<'ra>>,
10831083

10841084
underscore_disambiguator: u32,
1085-
/// Disambiguator for anonymous adts.
1086-
empty_disambiguator: u32,
10871085

10881086
/// Maps glob imports to the names of items actually imported.
10891087
glob_map: FxHashMap<LocalDefId, FxHashSet<Symbol>>,
@@ -1462,7 +1460,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
14621460
module_children: Default::default(),
14631461
trait_map: NodeMap::default(),
14641462
underscore_disambiguator: 0,
1465-
empty_disambiguator: 0,
14661463
empty_module,
14671464
module_map,
14681465
block_map: Default::default(),
@@ -1841,9 +1838,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
18411838
let disambiguator = if ident.name == kw::Underscore {
18421839
self.underscore_disambiguator += 1;
18431840
self.underscore_disambiguator
1844-
} else if ident.name == kw::Empty {
1845-
self.empty_disambiguator += 1;
1846-
self.empty_disambiguator
18471841
} else {
18481842
0
18491843
};

0 commit comments

Comments
 (0)