diff options
| author | Pietro Albini <pietro.albini@ferrous-systems.com> | 2022-01-14 09:50:49 +0100 |
|---|---|---|
| committer | Pietro Albini <pietro.albini@ferrous-systems.com> | 2022-01-28 15:01:07 +0100 |
| commit | 5b3462c556932234c6bae24c6f90c55a463f23c3 (patch) | |
| tree | 15271c9b25b59b2ea8a2b82b2803637201d208dc /compiler/rustc_middle/src/query/mod.rs | |
| parent | 970e603006db3e80b85252663588b7d34e932f10 (diff) | |
| download | rust-5b3462c556932234c6bae24c6f90c55a463f23c3.tar.gz rust-5b3462c556932234c6bae24c6f90c55a463f23c3.zip | |
update cfg(bootstrap)s
Diffstat (limited to 'compiler/rustc_middle/src/query/mod.rs')
| -rw-r--r-- | compiler/rustc_middle/src/query/mod.rs | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/compiler/rustc_middle/src/query/mod.rs b/compiler/rustc_middle/src/query/mod.rs index 5dc7b219642..cc72de7c548 100644 --- a/compiler/rustc_middle/src/query/mod.rs +++ b/compiler/rustc_middle/src/query/mod.rs @@ -784,24 +784,11 @@ rustc_queries! { desc { |tcx| "type-checking `{}`", tcx.def_path_str(key.to_def_id()) } cache_on_disk_if { true } load_cached(tcx, id) { - #[cfg(bootstrap)] - { - match match tcx.on_disk_cache().as_ref() { - Some(c) => c.try_load_query_result(*tcx, id), - None => None, - } { - Some(x) => Some(&*tcx.arena.alloc(x)), - None => None, - } - } - #[cfg(not(bootstrap))] - { - let typeck_results: Option<ty::TypeckResults<'tcx>> = tcx - .on_disk_cache().as_ref() - .and_then(|c| c.try_load_query_result(*tcx, id)); + let typeck_results: Option<ty::TypeckResults<'tcx>> = tcx + .on_disk_cache().as_ref() + .and_then(|c| c.try_load_query_result(*tcx, id)); - typeck_results.map(|x| &*tcx.arena.alloc(x)) - } + typeck_results.map(|x| &*tcx.arena.alloc(x)) } } |