Put more things into mod query_impl.

`define_queries!` currently outputs some things (including one `mod
$name` per query) into a module `query_impl`, and some things into the
crate root. This commit moves the latter things into `query_impl`. This
is (a) nicer, and (b) more closely matches what `define_callbacks!`
does.

Author: nnethercote

compiler/rustc_query_impl/src/lib.rs

@@ -21,6 +21,7 @@ pub use crate::dep_kind_vtables::make_dep_kind_vtables;
 use crate::from_cycle_error::FromCycleError;
 pub use crate::job::{QueryJobMap, break_query_cycles, print_query_stack};
 use crate::profiling_support::QueryKeyStringCache;
+pub use crate::query_impl::collect_active_jobs_from_all_queries;
 
 #[macro_use]
 mod plumbing;
@@ -54,7 +55,7 @@ pub fn query_system<'tcx>(
 ) -> QuerySystem<'tcx> {
     QuerySystem {
         arenas: Default::default(),
-        query_vtables: make_query_vtables(incremental),
+        query_vtables: query_impl::make_query_vtables(incremental),
         on_disk_cache,
         local_providers,
         extern_providers,
@@ -65,7 +66,7 @@ pub fn query_system<'tcx>(
 rustc_middle::rustc_with_all_queries! { define_queries! }
 
 pub fn provide(providers: &mut rustc_middle::util::Providers) {
-    providers.hooks.alloc_self_profile_query_strings = alloc_self_profile_query_strings;
-    providers.hooks.query_key_hash_verify_all = query_key_hash_verify_all;
-    providers.hooks.encode_all_query_results = encode_all_query_results;
+    providers.hooks.alloc_self_profile_query_strings = query_impl::alloc_self_profile_query_strings;
+    providers.hooks.query_key_hash_verify_all = query_impl::query_key_hash_verify_all;
+    providers.hooks.encode_all_query_results = query_impl::encode_all_query_results;
 }

compiler/rustc_query_impl/src/plumbing.rs

@@ -330,7 +330,7 @@ macro_rules! define_queries {
         non_queries { $($_:tt)* }
     ) => {
         pub(crate) mod query_impl { $(pub(crate) mod $name {
-            use super::super::*;
+            use super::*;
             use rustc_middle::query::erase::{self, Erased};
 
             // It seems to be important that every query has its own monomorphic
@@ -341,8 +341,9 @@ macro_rules! define_queries {
             pub(crate) mod execute_query_incr {
                 use super::*;
 
-                // Adding `__rust_end_short_backtrace` marker to backtraces so that we emit the frames
-                // when `RUST_BACKTRACE=1`, add a new mod with `$name` here is to allow duplicate naming
+                // Adding `__rust_end_short_backtrace` marker to backtraces so that we emit the
+                // frames when `RUST_BACKTRACE=1`, add a new mod with `$name` here is to allow
+                // duplicate naming.
                 #[inline(never)]
                 pub(crate) fn __rust_end_short_backtrace<'tcx>(
                     tcx: TyCtxt<'tcx>,
@@ -508,14 +509,16 @@ macro_rules! define_queries {
                     &tcx.query_system.query_vtables.$name
                 }
             }
-        })*}
+        })*
 
-        pub fn make_query_vtables<'tcx>(incremental: bool)
+        use super::*;
+
+        pub(crate) fn make_query_vtables<'tcx>(incremental: bool)
             -> rustc_middle::queries::QueryVTables<'tcx>
         {
             rustc_middle::queries::QueryVTables {
                 $(
-                    $name: query_impl::$name::make_query_vtable(incremental),
+                    $name: $name::make_query_vtable(incremental),
                 )*
             }
         }
@@ -559,7 +562,7 @@ macro_rules! define_queries {
         /// If we are recording only summary data, the ids will point to
         /// just the query names. If we are recording query keys too, we
         /// allocate the corresponding strings here.
-        pub fn alloc_self_profile_query_strings(tcx: TyCtxt<'_>) {
+        pub(crate) fn alloc_self_profile_query_strings(tcx: TyCtxt<'_>) {
             if !tcx.prof.enabled() {
                 return;
             }
@@ -580,7 +583,7 @@ macro_rules! define_queries {
             tcx.sess.prof.store_query_cache_hits();
         }
 
-        fn encode_all_query_results<'tcx>(
+        pub(crate) fn encode_all_query_results<'tcx>(
             tcx: TyCtxt<'tcx>,
             encoder: &mut CacheEncoder<'_, 'tcx>,
             query_result_index: &mut EncodedDepNodeIndex,
@@ -598,7 +601,7 @@ macro_rules! define_queries {
             )*
         }
 
-        pub fn query_key_hash_verify_all<'tcx>(tcx: TyCtxt<'tcx>) {
+        pub(crate) fn query_key_hash_verify_all<'tcx>(tcx: TyCtxt<'tcx>) {
             if tcx.sess.opts.unstable_opts.incremental_verify_ich || cfg!(debug_assertions) {
                 tcx.sess.time("query_key_hash_verify_all", || {
                     $(
@@ -610,5 +613,5 @@ macro_rules! define_queries {
                 })
             }
         }
-    }
+    }}
 }