about summary refs log tree commit diff
path: root/compiler/rustc_resolve
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-07-06 11:31:59 +0000
committerbors <bors@rust-lang.org>2021-07-06 11:31:59 +0000
commitd04ec4735810553224eb5eaf948ec78f84eac06c (patch)
treec6eede57b0a57bcfebc089a657f28c4403fcbf41 /compiler/rustc_resolve
parentd7901f37bb74ee677ff939c324d49a9a0a5b4aca (diff)
parent56c6a48d2e52fac9fec3124fa84c096668738917 (diff)
downloadrust-d04ec4735810553224eb5eaf948ec78f84eac06c.tar.gz
rust-d04ec4735810553224eb5eaf948ec78f84eac06c.zip
Auto merge of #86143 - bjorn3:revert_revert_merge_crate_disambiguator, r=michaelwoerister
Reland "Merge CrateDisambiguator into StableCrateId"

Reverts https://github.com/rust-lang/rust/pull/85891 as this revert of #85804 made perf even worse.

r? `@Mark-Simulacrum`
Diffstat (limited to 'compiler/rustc_resolve')
-rw-r--r--compiler/rustc_resolve/src/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_resolve/src/lib.rs b/compiler/rustc_resolve/src/lib.rs
index 83e904eb16b..559a9967086 100644
--- a/compiler/rustc_resolve/src/lib.rs
+++ b/compiler/rustc_resolve/src/lib.rs
@@ -1221,7 +1221,7 @@ impl<'a> Resolver<'a> {
         let mut module_map = FxHashMap::default();
         module_map.insert(root_local_def_id, graph_root);
 
-        let definitions = Definitions::new(crate_name, session.local_crate_disambiguator());
+        let definitions = Definitions::new(session.local_stable_crate_id());
         let root = definitions.get_root_def();
 
         let mut visibilities = FxHashMap::default();