mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary TRY_LOAD_FROM_DISK constant

Browse Source
This commit is contained in:
Joshua Nelson 2022-09-06 19:09:32 -05:00
parent 9273782d55
commit 0a9d7dbca2
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compiler/rustc_query_impl/src/lib.rs
View File

@ -34,7 +34,6 @@ pub use rustc_query_system::query::{deadlock, QueryContext};
mod keys; mod keys;
use keys::Key; use keys::Key;
use rustc_query_system::dep_graph::SerializedDepNodeIndex;
pub use rustc_query_system::query::QueryConfig; pub use rustc_query_system::query::QueryConfig;
pub(crate) use rustc_query_system::query::{QueryDescription, QueryVTable}; pub(crate) use rustc_query_system::query::{QueryDescription, QueryVTable};

5
compiler/rustc_query_impl/src/plumbing.rs
View File

@ -412,9 +412,6 @@ macro_rules! define_queries {
impl<'tcx> QueryDescription<QueryCtxt<'tcx>> for queries::$name<'tcx> { impl<'tcx> QueryDescription<QueryCtxt<'tcx>> for queries::$name<'tcx> {
rustc_query_description! { $name } 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>; type Cache = query_storage::$name<'tcx>;
#[inline(always)] #[inline(always)]
@ -445,7 +442,7 @@ macro_rules! define_queries {
hash_result: hash_result!([$($modifiers)*]), hash_result: hash_result!([$($modifiers)*]),
handle_cycle_error: handle_cycle_error!([$($modifiers)*]), handle_cycle_error: handle_cycle_error!([$($modifiers)*]),
compute, 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 },
} }
} }

5
compiler/rustc_query_system/src/query/config.rs
View File

@ -29,8 +29,7 @@ pub struct QueryVTable<CTX: QueryContext, K, V> {
pub compute: fn(CTX::DepContext, K) -> V, pub compute: fn(CTX::DepContext, K) -> V,
pub hash_result: Option<fn(&mut StableHashingContext<'_>, &V) -> Fingerprint>, pub hash_result: Option<fn(&mut StableHashingContext<'_>, &V) -> Fingerprint>,
pub handle_cycle_error: HandleCycleError, pub handle_cycle_error: HandleCycleError,
// NOTE: this is not quite the same as `Q::TRY_LOAD_FROM_DISK`; it can also be `None` if // NOTE: this is also `None` if `cache_on_disk()` returns false, not just if it's unsupported by the query
// `cache_on_disk` returned false for this key.
pub try_load_from_disk: Option<fn(CTX, SerializedDepNodeIndex) -> Option<V>>, pub try_load_from_disk: Option<fn(CTX, SerializedDepNodeIndex) -> Option<V>>,
} }
@ -48,8 +47,6 @@ impl<CTX: QueryContext, K, V> QueryVTable<CTX, K, V> {
} }
pub trait QueryDescription<CTX: QueryContext>: QueryConfig { pub trait QueryDescription<CTX: QueryContext>: QueryConfig {
const TRY_LOAD_FROM_DISK: Option<fn(CTX, SerializedDepNodeIndex) -> Option<Self::Value>>;
type Cache: QueryCache<Key = Self::Key, Stored = Self::Stored, Value = Self::Value>; type Cache: QueryCache<Key = Self::Key, Stored = Self::Stored, Value = Self::Value>;
fn describe(tcx: CTX, key: Self::Key) -> String; fn describe(tcx: CTX, key: Self::Key) -> String;