bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Move TRY_LOAD_FROM_DISK out of rustc_queries to rustc_query_impl

Browse source 
We want to refer to `crate::plumbing::try_load_from_disk` in the const, but hard-coding it in
rustc_queries, where we don't yet know the crate this macro will be called in, seems kind of hacky.
Do it in query_impl instead.
This commit is contained in:
Joshua Nelson 2022-09-05 06:43:11 -05:00
parent 7208bdee33
commit 9273782d55
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_macros/src/query.rs
View file

@ -253,9 +253,6 @@ fn add_query_description_impl(query: &Query, impls: &mut proc_macro2::TokenStrea
fn cache_on_disk(#tcx: TyCtxt<'tcx>, #key: &Self::Key) -> bool {
#expr
}
const TRY_LOAD_FROM_DISK: Option<fn(QueryCtxt<'tcx>, SerializedDepNodeIndex) -> Option<Self::Value>>
= Some(crate::plumbing::try_load_from_disk::<Self::Value>);
}
} else {
quote! {
@ -263,8 +260,6 @@ fn add_query_description_impl(query: &Query, impls: &mut proc_macro2::TokenStrea
fn cache_on_disk(_: TyCtxt<'tcx>, _: &Self::Key) -> bool {
false
}
const TRY_LOAD_FROM_DISK: Option<fn(QueryCtxt<'tcx>, SerializedDepNodeIndex) -> Option<Self::Value>> = None;
}
};
@ -333,6 +328,10 @@ pub fn rustc_queries(input: TokenStream) -> TokenStream {
remap_env_constness,
);
if modifiers.cache.is_some() {
attributes.push(quote! { (cache) });
}
// This uses the span of the query definition for the commas,
// which can be important if we later encounter any ambiguity
// errors with any of the numerous macro_rules! macros that