Move QueryMode.

From `rustc_query_system::query::plumbing` to
`rustc_middle::query::plumbing`.

Author: nnethercote

compiler/rustc_middle/src/query/inner.rs

@@ -2,13 +2,12 @@
 //! `tcx.$query(..)` and its variations.
 
 use rustc_query_system::dep_graph::{DepKind, DepNodeKey};
-use rustc_query_system::query::QueryMode;
 use rustc_span::{DUMMY_SP, ErrorGuaranteed, Span};
 
 use crate::dep_graph;
-use crate::query::QueryCache;
 use crate::query::erase::{self, Erasable, Erased};
 use crate::query::plumbing::QueryVTable;
+use crate::query::{QueryCache, QueryMode};
 use crate::ty::TyCtxt;
 
 /// Checks whether there is already a value for this key in the in-memory

compiler/rustc_middle/src/query/mod.rs

@@ -1,14 +1,13 @@
 use rustc_hir::def_id::LocalDefId;
-pub use rustc_query_system::query::QueryMode;
 
 pub use self::caches::{
     DefIdCache, DefaultCache, QueryCache, QueryCacheKey, SingleCache, VecCache,
 };
 pub use self::job::{QueryInfo, QueryJob, QueryJobId, QueryLatch, QueryWaiter};
 pub use self::keys::{AsLocalKey, Key, LocalCrate};
 pub use self::plumbing::{
-    ActiveKeyStatus, CycleError, CycleErrorHandling, IntoQueryParam, QueryState, TyCtxtAt,
-    TyCtxtEnsureDone, TyCtxtEnsureOk,
+    ActiveKeyStatus, CycleError, CycleErrorHandling, IntoQueryParam, QueryMode, QueryState,
+    TyCtxtAt, TyCtxtEnsureDone, TyCtxtEnsureOk,
 };
 pub use self::stack::{QueryStackDeferred, QueryStackFrame, QueryStackFrameExtra};
 pub use crate::queries::Providers;

compiler/rustc_middle/src/query/plumbing.rs

@@ -1,3 +1,4 @@
+use std::fmt::Debug;
 use std::ops::Deref;
 
 use rustc_data_structures::fingerprint::Fingerprint;
@@ -95,6 +96,12 @@ impl<'tcx> CycleError<QueryStackDeferred<'tcx>> {
     }
 }
 
+#[derive(Debug)]
+pub enum QueryMode {
+    Get,
+    Ensure { check_cache: bool },
+}
+
 /// Stores function pointers and other metadata for a particular query.
 ///
 /// Used indirectly by query plumbing in `rustc_query_system` via a trait,

compiler/rustc_query_impl/src/execution.rs

@@ -8,11 +8,11 @@ use rustc_errors::{Diag, FatalError, StashKey};
 use rustc_middle::dep_graph::DepsType;
 use rustc_middle::query::{
     ActiveKeyStatus, CycleError, CycleErrorHandling, QueryCache, QueryJob, QueryJobId, QueryLatch,
-    QueryStackDeferred, QueryStackFrame, QueryState,
+    QueryMode, QueryStackDeferred, QueryStackFrame, QueryState,
 };
 use rustc_middle::ty::TyCtxt;
 use rustc_query_system::dep_graph::{DepGraphData, DepNodeKey, HasDepContext};
-use rustc_query_system::query::{QueryMode, incremental_verify_ich};
+use rustc_query_system::query::incremental_verify_ich;
 use rustc_span::{DUMMY_SP, Span};
 
 use crate::dep_graph::{DepContext, DepNode, DepNodeIndex};

compiler/rustc_query_impl/src/lib.rs

@@ -21,10 +21,9 @@ use rustc_middle::query::on_disk_cache::{CacheEncoder, EncodedDepNodeIndex, OnDi
 use rustc_middle::query::plumbing::{
     HashResult, QueryState, QuerySystem, QuerySystemFns, QueryVTable,
 };
-use rustc_middle::query::{AsLocalKey, CycleError, CycleErrorHandling, QueryCache};
+use rustc_middle::query::{AsLocalKey, CycleError, CycleErrorHandling, QueryCache, QueryMode};
 use rustc_middle::ty::TyCtxt;
 use rustc_query_system::dep_graph::SerializedDepNodeIndex;
-use rustc_query_system::query::QueryMode;
 use rustc_span::{ErrorGuaranteed, Span};
 
 pub use crate::job::{QueryJobMap, break_query_cycles, print_query_stack};

compiler/rustc_query_system/src/query/plumbing.rs

@@ -1,5 +1,4 @@
 use std::cell::Cell;
-use std::fmt::Debug;
 
 use rustc_data_structures::fingerprint::Fingerprint;
 use tracing::instrument;
@@ -90,9 +89,3 @@ fn incremental_verify_ich_failed<Tcx>(
 
     INSIDE_VERIFY_PANIC.set(old_in_panic);
 }
-
-#[derive(Debug)]
-pub enum QueryMode {
-    Get,
-    Ensure { check_cache: bool },
-}