diff options
| author | Joshua Nelson <jnelson@cloudflare.com> | 2022-08-23 21:47:59 -0500 |
|---|---|---|
| committer | Joshua Nelson <jnelson@cloudflare.com> | 2022-09-01 18:34:37 -0500 |
| commit | 1cf7bcc388b5aee7ef940d730d1ede212f8e5a31 (patch) | |
| tree | 731d73513019b3265e215afb4c36773a80b186fa | |
| parent | 2e35f954ada0f0c777844dc4fa66684efe90a035 (diff) | |
| download | rust-1cf7bcc388b5aee7ef940d730d1ede212f8e5a31.tar.gz rust-1cf7bcc388b5aee7ef940d730d1ede212f8e5a31.zip | |
Get rid of `make_query` module
| -rw-r--r-- | compiler/rustc_query_impl/src/plumbing.rs | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/compiler/rustc_query_impl/src/plumbing.rs b/compiler/rustc_query_impl/src/plumbing.rs index eabb3166147..b115381eb1c 100644 --- a/compiler/rustc_query_impl/src/plumbing.rs +++ b/compiler/rustc_query_impl/src/plumbing.rs @@ -308,18 +308,6 @@ macro_rules! define_queries { 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)] mod queries { use std::marker::PhantomData; @@ -531,9 +519,14 @@ macro_rules! define_queries_struct { 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( tcx, - make_query::$name, + make_query, &mut jobs, )?; )* |