Revert "Revert "Merge CrateDisambiguator into StableCrateId""

This reverts commit 8176ab8bc1.
2021-06-08 18:36:30 +02:00 · 2021-06-08 18:36:30 +02:00 · 489ad8b8b5
commit 489ad8b8b5
parent 9a27044f42
28 changed files with 116 additions and 193 deletions
--- a/compiler/rustc_save_analysis/src/dump_visitor.rs
+++ b/compiler/rustc_save_analysis/src/dump_visitor.rs
@ -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(),