Rollup merge of #85989 - jyn514:gitignore-cleanup, r=ehuss

[rust.git] / compiler / rustc_middle / src / ty / query / on_disk_cache.rs

diff --git a/compiler/rustc_middle/src/ty/query/on_disk_cache.rs b/compiler/rustc_middle/src/ty/query/on_disk_cache.rs
index a688b816e9af9b95a60b7218746727f2af35c7bc..ebb52d8863f37ecc727fc8147714dfdea626e0d9 100644 (file)
--- a/compiler/rustc_middle/src/ty/query/on_disk_cache.rs
+++ b/compiler/rustc_middle/src/ty/query/on_disk_cache.rs
@@ -349,7 +349,7 @@ pub fn serialize<'tcx>(
             let prev_cnums: Vec<_> = sorted_cnums
                 .iter()
                 .map(|&cnum| {
-                    let crate_name = tcx.original_crate_name(cnum).to_string();
+                    let crate_name = tcx.crate_name(cnum).to_string();
                     let crate_disambiguator = tcx.crate_disambiguator(cnum);
                     (cnum.as_u32(), crate_name, crate_disambiguator)
                 })
@@ -582,7 +582,7 @@ fn compute_cnum_map(
                 .all_crate_nums(())
                 .iter()
                 .map(|&cnum| {
-                    let crate_name = tcx.original_crate_name(cnum).to_string();
+                    let crate_name = tcx.crate_name(cnum).to_string();
                     let crate_disambiguator = tcx.crate_disambiguator(cnum);
                     ((crate_name, crate_disambiguator), cnum)
                 })
@@ -758,8 +758,7 @@ fn cached_ty_for_shorthand<F>(
     {
         let tcx = self.tcx();
 
-        let cache_key =
-            ty::CReaderCacheKey { cnum: CrateNum::ReservedForIncrCompCache, pos: shorthand };
+        let cache_key = ty::CReaderCacheKey { cnum: None, pos: shorthand };
 
         if let Some(&ty) = tcx.ty_rcache.borrow().get(&cache_key) {
             return Ok(ty);