bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Merge CrateDisambiguator into StableCrateId

Browse source
This commit is contained in:
bjorn3 2021-05-29 12:09:23 +02:00
parent d93b6a4598
commit d0ec85d3fb
30 changed files with 125 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_save_analysis/src/dump_visitor.rs
View file

@ -142,12 +142,7 @@ impl<'tcx> DumpVisitor<'tcx> {
let data = CratePreludeData {
crate_id: GlobalCrateId {
name: name.into(),
disambiguator: self
.tcx
.sess
.local_crate_disambiguator()
.to_fingerprint()
.as_value(),
disambiguator: (self.tcx.sess.local_stable_crate_id().to_u64(), 0),
},
crate_root: crate_root.unwrap_or_else(|| "<no source>".to_owned()),
external_crates: self.save_ctxt.get_external_crates(),

5
compiler/rustc_save_analysis/src/lib.rs
View file

@ -127,7 +127,10 @@ impl<'tcx> SaveContext<'tcx> {
num: n.as_u32(),
id: GlobalCrateId {
name: self.tcx.crate_name(n).to_string(),
disambiguator: self.tcx.crate_disambiguator(n).to_fingerprint().as_value(),
disambiguator: (
self.tcx.def_path_hash(n.as_def_id()).stable_crate_id().to_u64(),
0,
),
},
});
}