From 2ddd0fe2784652d40427a6d52d727603c0008a19 Mon Sep 17 00:00:00 2001 From: Michael Goulet Date: Thu, 26 Oct 2023 13:35:44 -0400 Subject: [PATCH] Apply suggestions from code review --- compiler/rustc_macros/src/query.rs | 2 +- compiler/rustc_query_impl/src/plumbing.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/rustc_macros/src/query.rs b/compiler/rustc_macros/src/query.rs index 817c475cbca69..ad1980136f3b9 100644 --- a/compiler/rustc_macros/src/query.rs +++ b/compiler/rustc_macros/src/query.rs @@ -97,7 +97,7 @@ struct QueryModifiers { /// A cycle error results in a delay_bug call cycle_delay_bug: Option, - /// A cycle error results in a delay_bug call + /// A cycle error results in a stashed cycle error that can be unstashed and canceled later cycle_stash: Option, /// Don't hash the result, instead just mark a query red if it runs diff --git a/compiler/rustc_query_impl/src/plumbing.rs b/compiler/rustc_query_impl/src/plumbing.rs index 8c0829f415ef2..536c0a20e2a22 100644 --- a/compiler/rustc_query_impl/src/plumbing.rs +++ b/compiler/rustc_query_impl/src/plumbing.rs @@ -198,7 +198,7 @@ macro_rules! handle_cycle_error { rustc_query_system::HandleCycleError::Fatal }}; ([(cycle_stash) $($rest:tt)*]) => {{ - rustc_query_system::HandleCycleError::DelayBug + rustc_query_system::HandleCycleError::Stash }}; ([(cycle_delay_bug) $($rest:tt)*]) => {{ rustc_query_system::HandleCycleError::DelayBug