about summary refs log tree commit diff
path: root/compiler/rustc_query_impl
diff options
context:
space:
mode:
authorJoshua Nelson <jnelson@cloudflare.com>2022-09-06 19:09:32 -0500
committerJoshua Nelson <jnelson@cloudflare.com>2022-09-09 20:24:02 -0500
commit0a9d7dbca23bb05fab13c1dc75a87cdb2bf69ff5 (patch)
treec97b23b8de5069c19b2413ea079bdd04b9c85244 /compiler/rustc_query_impl
parent9273782d559a342beb2443018f2f8fc873f53b79 (diff)
downloadrust-0a9d7dbca23bb05fab13c1dc75a87cdb2bf69ff5.tar.gz
rust-0a9d7dbca23bb05fab13c1dc75a87cdb2bf69ff5.zip
Remove unnecessary `TRY_LOAD_FROM_DISK` constant
Diffstat (limited to 'compiler/rustc_query_impl')
-rw-r--r--compiler/rustc_query_impl/src/lib.rs1
-rw-r--r--compiler/rustc_query_impl/src/plumbing.rs5
2 files changed, 1 insertions, 5 deletions
diff --git a/compiler/rustc_query_impl/src/lib.rs b/compiler/rustc_query_impl/src/lib.rs
index 8148f8e017c..c87d26b3950 100644
--- a/compiler/rustc_query_impl/src/lib.rs
+++ b/compiler/rustc_query_impl/src/lib.rs
@@ -34,7 +34,6 @@ pub use rustc_query_system::query::{deadlock, QueryContext};
 mod keys;
 use keys::Key;
 
-use rustc_query_system::dep_graph::SerializedDepNodeIndex;
 pub use rustc_query_system::query::QueryConfig;
 pub(crate) use rustc_query_system::query::{QueryDescription, QueryVTable};
 
diff --git a/compiler/rustc_query_impl/src/plumbing.rs b/compiler/rustc_query_impl/src/plumbing.rs
index e38de2a0e40..6e0649cc471 100644
--- a/compiler/rustc_query_impl/src/plumbing.rs
+++ b/compiler/rustc_query_impl/src/plumbing.rs
@@ -412,9 +412,6 @@ macro_rules! define_queries {
         impl<'tcx> QueryDescription<QueryCtxt<'tcx>> for queries::$name<'tcx> {
             rustc_query_description! { $name }
 
-            const TRY_LOAD_FROM_DISK: Option<fn(QueryCtxt<'tcx>, SerializedDepNodeIndex) -> Option<Self::Value>>
-                = should_ever_cache_on_disk!([$($modifiers)*]);
-
             type Cache = query_storage::$name<'tcx>;
 
             #[inline(always)]
@@ -445,7 +442,7 @@ macro_rules! define_queries {
                     hash_result: hash_result!([$($modifiers)*]),
                     handle_cycle_error: handle_cycle_error!([$($modifiers)*]),
                     compute,
-                    try_load_from_disk: if cache_on_disk { Self::TRY_LOAD_FROM_DISK } else { None },
+                    try_load_from_disk: if cache_on_disk { should_ever_cache_on_disk!([$($modifiers)*]) } else { None },
                 }
             }