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/execution.rs

@@ -17,9 +17,9 @@ use rustc_middle::verify_ich::incremental_verify_ich;
 use rustc_span::{DUMMY_SP, Span};
 
 use crate::dep_graph::{DepNode, DepNodeIndex};
-use crate::for_each_query_vtable;
 use crate::job::{QueryJobInfo, QueryJobMap, find_cycle_in_stack, report_cycle};
 use crate::plumbing::{current_query_job, next_job_id, start_query};
+use crate::query_impl::for_each_query_vtable;
 
 #[inline]
 fn equivalent_key<K: Eq, V>(k: K) -> impl Fn(&(K, V)) -> bool {

compiler/rustc_query_impl/src/lib.rs

@@ -51,7 +51,7 @@ pub fn query_system<'tcx>(
     on_disk_cache: Option<OnDiskCache>,
     incremental: bool,
 ) -> QuerySystem<'tcx> {
-    let mut query_vtables = make_query_vtables(incremental);
+    let mut query_vtables = query_impl::make_query_vtables(incremental);
     from_cycle_error::specialize_query_vtables(&mut query_vtables);
     QuerySystem {
         arenas: Default::default(),

compiler/rustc_query_impl/src/plumbing.rs

@@ -33,7 +33,8 @@ use rustc_span::def_id::LOCAL_CRATE;
 use crate::error::{QueryOverflow, QueryOverflowNote};
 use crate::execution::{all_inactive, force_query};
 use crate::job::find_dep_kind_root;
-use crate::{GetQueryVTable, collect_active_jobs_from_all_queries, for_each_query_vtable};
+use crate::query_impl::for_each_query_vtable;
+use crate::{GetQueryVTable, collect_active_jobs_from_all_queries};
 
 fn depth_limit_error<'tcx>(tcx: TyCtxt<'tcx>, job: QueryJobId) {
     let job_map =
@@ -350,7 +351,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
@@ -361,8 +362,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>,
@@ -526,14 +528,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),
                 )*
             }
         }
@@ -581,5 +585,5 @@ macro_rules! define_queries {
         }
 
         pub(crate) use for_each_query_vtable;
-    }
+    }}
 }

compiler/rustc_query_impl/src/profiling_support.rs

@@ -10,7 +10,7 @@ use rustc_middle::query::QueryCache;
 use rustc_middle::query::plumbing::QueryVTable;
 use rustc_middle::ty::TyCtxt;
 
-use crate::for_each_query_vtable;
+use crate::query_impl::for_each_query_vtable;
 
 pub(crate) struct QueryKeyStringCache {
     def_id_cache: FxHashMap<DefId, StringId>,