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

Get rid of make_query module

Browse source
This commit is contained in:
Joshua Nelson 2022-08-23 21:47:59 -05:00
parent 2e35f954ad
commit 1cf7bcc388
1 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
compiler/rustc_query_impl/src/plumbing.rs
View file

@ -308,18 +308,6 @@ macro_rules! define_queries {
input: ($(([$($modifiers)*] [$($attr)*] [$name]))*) input: ($(([$($modifiers)*] [$($attr)*] [$name]))*)
} }
mod make_query {
use super::*;
// Create an eponymous constructor for each query.
$(#[allow(nonstandard_style)] $(#[$attr])*
pub fn $name<'tcx>(tcx: QueryCtxt<'tcx>, key: <queries::$name<'tcx> as QueryConfig>::Key) -> QueryStackFrame {
let kind = dep_graph::DepKind::$name;
let name = stringify!($name);
$crate::plumbing::create_query_frame(tcx, queries::$name::describe, key, kind, name)
})*
}
#[allow(nonstandard_style)] #[allow(nonstandard_style)]
mod queries { mod queries {
use std::marker::PhantomData; use std::marker::PhantomData;
@ -531,9 +519,14 @@ macro_rules! define_queries_struct {
let mut jobs = QueryMap::default(); let mut jobs = QueryMap::default();
$( $(
let make_query = |tcx, key| {
let kind = dep_graph::DepKind::$name;
let name = stringify!($name);
$crate::plumbing::create_query_frame(tcx, queries::$name::describe, key, kind, name)
};
self.$name.try_collect_active_jobs( self.$name.try_collect_active_jobs(
tcx, tcx,
make_query::$name, make_query,
&mut jobs, &mut jobs,
)?; )?;
)* )*