bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #86143 - bjorn3:revert_revert_merge_crate_disambiguator, r=michaelwoerister

Browse source 
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`
This commit is contained in:
bors 2021-07-06 11:31:59 +00:00
commit d04ec47358
67 changed files with 227 additions and 298 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_resolve/src/lib.rs
View file

@ -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();