Move CycleErrorHandling.

From `rustc_query_system` to `rustc_middle`.

Author: nnethercote

compiler/rustc_middle/src/query/mod.rs

@@ -7,8 +7,8 @@ pub use self::caches::{
 pub use self::job::{QueryInfo, QueryJob, QueryJobId, QueryLatch, QueryWaiter};
 pub use self::keys::{AsLocalKey, Key, LocalCrate};
 pub use self::plumbing::{
-    ActiveKeyStatus, CycleError, IntoQueryParam, QueryState, TyCtxtAt, TyCtxtEnsureDone,
-    TyCtxtEnsureOk,
+    ActiveKeyStatus, CycleError, CycleErrorHandling, IntoQueryParam, QueryState, TyCtxtAt,
+    TyCtxtEnsureDone, TyCtxtEnsureOk,
 };
 pub use self::stack::{QueryStackDeferred, QueryStackFrame, QueryStackFrameExtra};
 pub use crate::queries::Providers;

compiler/rustc_middle/src/query/plumbing.rs

@@ -9,7 +9,6 @@ use rustc_hir::hir_id::OwnerId;
 use rustc_macros::HashStable;
 use rustc_query_system::dep_graph::{DepNodeIndex, SerializedDepNodeIndex};
 use rustc_query_system::ich::StableHashingContext;
-use rustc_query_system::query::CycleErrorHandling;
 use rustc_span::{ErrorGuaranteed, Span};
 pub use sealed::IntoQueryParam;
 
@@ -54,6 +53,18 @@ pub enum ActiveKeyStatus<'tcx> {
     Poisoned,
 }
 
+/// How a particular query deals with query cycle errors.
+///
+/// Inspected by the code that actually handles cycle errors, to decide what
+/// approach to use.
+#[derive(Copy, Clone)]
+pub enum CycleErrorHandling {
+    Error,
+    Fatal,
+    DelayBug,
+    Stash,
+}
+
 pub type WillCacheOnDiskForKeyFn<'tcx, Key> = fn(tcx: TyCtxt<'tcx>, key: &Key) -> bool;
 
 pub type TryLoadFromDiskFn<'tcx, Key, Value> = fn(

compiler/rustc_query_impl/src/execution.rs

@@ -7,12 +7,12 @@ use rustc_data_structures::{outline, sharded, sync};
 use rustc_errors::{Diag, FatalError, StashKey};
 use rustc_middle::dep_graph::DepsType;
 use rustc_middle::query::{
-    ActiveKeyStatus, CycleError, QueryCache, QueryJob, QueryJobId, QueryLatch, QueryStackDeferred,
-    QueryStackFrame, QueryState,
+    ActiveKeyStatus, CycleError, CycleErrorHandling, QueryCache, QueryJob, QueryJobId, QueryLatch,
+    QueryStackDeferred, QueryStackFrame, QueryState,
 };
 use rustc_middle::ty::TyCtxt;
 use rustc_query_system::dep_graph::{DepGraphData, DepNodeKey, HasDepContext};
-use rustc_query_system::query::{CycleErrorHandling, QueryMode, incremental_verify_ich};
+use rustc_query_system::query::{QueryMode, 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,10 @@ 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, QueryCache};
+use rustc_middle::query::{AsLocalKey, CycleError, CycleErrorHandling, QueryCache};
 use rustc_middle::ty::TyCtxt;
 use rustc_query_system::dep_graph::SerializedDepNodeIndex;
-use rustc_query_system::query::{CycleErrorHandling, QueryMode};
+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_impl/src/plumbing.rs

@@ -207,16 +207,16 @@ pub fn query_key_hash_verify_all<'tcx>(tcx: TyCtxt<'tcx>) {
 
 macro_rules! cycle_error_handling {
     ([]) => {{
-        rustc_query_system::query::CycleErrorHandling::Error
+        rustc_middle::query::CycleErrorHandling::Error
     }};
     ([(cycle_fatal) $($rest:tt)*]) => {{
-        rustc_query_system::query::CycleErrorHandling::Fatal
+        rustc_middle::query::CycleErrorHandling::Fatal
     }};
     ([(cycle_stash) $($rest:tt)*]) => {{
-        rustc_query_system::query::CycleErrorHandling::Stash
+        rustc_middle::query::CycleErrorHandling::Stash
     }};
     ([(cycle_delay_bug) $($rest:tt)*]) => {{
-        rustc_query_system::query::CycleErrorHandling::DelayBug
+        rustc_middle::query::CycleErrorHandling::DelayBug
     }};
     ([$other:tt $($modifiers:tt)*]) => {
         cycle_error_handling!([$($modifiers)*])

compiler/rustc_query_system/src/query/mod.rs

@@ -9,18 +9,6 @@ use crate::dep_graph::{DepNodeIndex, HasDepContext, SerializedDepNodeIndex};
 
 mod plumbing;
 
-/// How a particular query deals with query cycle errors.
-///
-/// Inspected by the code that actually handles cycle errors, to decide what
-/// approach to use.
-#[derive(Copy, Clone)]
-pub enum CycleErrorHandling {
-    Error,
-    Fatal,
-    DelayBug,
-    Stash,
-}
-
 /// Tracks 'side effects' for a particular query.
 /// This struct is saved to disk along with the query result,
 /// and loaded from disk if we mark the query as green.