Rename the cycle_delay_bug modifier as cycle_delayed_bug.

Because "delayed bug" is the correct term used everywhere else, e.g.
`Level::DelayedBug`, `DiagCtxtHandle::delayed_bug`.

Author: nnethercote

compiler/rustc_macros/src/query.rs

@@ -143,7 +143,7 @@ struct QueryModifiers {
     anon: Option<Ident>,
     arena_cache: Option<Ident>,
     cache_on_disk_if: Option<CacheOnDiskIf>,
-    cycle_delay_bug: Option<Ident>,
+    cycle_delayed_bug: Option<Ident>,
     cycle_stash: Option<Ident>,
     depth_limit: Option<Ident>,
     desc: Desc,
@@ -158,7 +158,7 @@ fn parse_query_modifiers(input: ParseStream<'_>) -> Result<QueryModifiers> {
     let mut arena_cache = None;
     let mut cache_on_disk_if = None;
     let mut desc = None;
-    let mut cycle_delay_bug = None;
+    let mut cycle_delayed_bug = None;
     let mut cycle_stash = None;
     let mut no_hash = None;
     let mut anon = None;
@@ -193,8 +193,8 @@ fn parse_query_modifiers(input: ParseStream<'_>) -> Result<QueryModifiers> {
             try_insert!(cache_on_disk_if = CacheOnDiskIf { modifier, block });
         } else if modifier == "arena_cache" {
             try_insert!(arena_cache = modifier);
-        } else if modifier == "cycle_delay_bug" {
-            try_insert!(cycle_delay_bug = modifier);
+        } else if modifier == "cycle_delayed_bug" {
+            try_insert!(cycle_delayed_bug = modifier);
         } else if modifier == "cycle_stash" {
             try_insert!(cycle_stash = modifier);
         } else if modifier == "no_hash" {
@@ -220,7 +220,7 @@ fn parse_query_modifiers(input: ParseStream<'_>) -> Result<QueryModifiers> {
         arena_cache,
         cache_on_disk_if,
         desc,
-        cycle_delay_bug,
+        cycle_delayed_bug,
         cycle_stash,
         no_hash,
         anon,
@@ -256,7 +256,7 @@ fn make_modifiers_stream(query: &Query) -> proc_macro2::TokenStream {
         anon,
         arena_cache,
         cache_on_disk_if,
-        cycle_delay_bug,
+        cycle_delayed_bug,
         cycle_stash,
         depth_limit,
         desc: _,
@@ -271,8 +271,8 @@ fn make_modifiers_stream(query: &Query) -> proc_macro2::TokenStream {
     let arena_cache = arena_cache.is_some();
     let cache_on_disk = cache_on_disk_if.is_some();
 
-    let cycle_error_handling = if cycle_delay_bug.is_some() {
-        quote! { DelayBug }
+    let cycle_error_handling = if cycle_delayed_bug.is_some() {
+        quote! { DelayedBug }
     } else if cycle_stash.is_some() {
         quote! { Stash }
     } else {
@@ -411,7 +411,7 @@ fn add_to_analyzer_stream(query: &Query, analyzer_stream: &mut proc_macro2::Toke
 
     doc_link!(
         arena_cache,
-        cycle_delay_bug,
+        cycle_delayed_bug,
         cycle_stash,
         no_hash,
         anon,

compiler/rustc_middle/src/queries.rs

@@ -32,7 +32,7 @@
 //! - `arena_cache`: Use an arena for in-memory caching of the query result.
 //! - `cache_on_disk_if { ... }`: Cache the query result to disk if the provided block evaluates to
 //!   true. The query key identifier is available for use within the block, as is `tcx`.
-//! - `cycle_delay_bug`: If a dependency cycle is detected, emit a delayed bug instead of aborting immediately.
+//! - `cycle_delayed_bug`: If a dependency cycle is detected, emit a delayed bug instead of aborting immediately.
 //! - `cycle_stash`: If a dependency cycle is detected, stash the error for later handling.
 //! - `no_hash`: Do not hash the query result for incremental compilation; just mark as dirty if recomputed.
 //! - `anon`: Make the query anonymous in the dependency graph (no dep node is created).
@@ -595,7 +595,7 @@ rustc_queries! {
         // `Representability` will print a custom error about the infinite size and then abort
         // compilation. (In the past we recovered and continued, but in practice that leads to
         // confusing subsequent error messages about cycles that then abort.)
-        cycle_delay_bug
+        cycle_delayed_bug
         // We don't want recursive representability calls to be forced with
         // incremental compilation because, if a cycle occurs, we need the
         // entire cycle to be in memory for diagnostics. This means we can't
@@ -607,7 +607,7 @@ rustc_queries! {
     /// details, particularly on the modifiers.
     query check_representability_adt_ty(key: Ty<'tcx>) -> rustc_middle::ty::Representability {
         desc { "checking if `{}` is representable", key }
-        cycle_delay_bug
+        cycle_delayed_bug
         anon
     }
 
@@ -1052,7 +1052,7 @@ rustc_queries! {
         desc { "computing the variances of `{}`", tcx.def_path_str(def_id) }
         cache_on_disk_if { def_id.is_local() }
         separate_provide_extern
-        cycle_delay_bug
+        cycle_delayed_bug
     }
 
     /// Gets a map with the inferred outlives-predicates of every item in the local crate.
@@ -1185,7 +1185,7 @@ rustc_queries! {
         desc { "computing function signature of `{}`", tcx.def_path_str(key) }
         cache_on_disk_if { key.is_local() }
         separate_provide_extern
-        cycle_delay_bug
+        cycle_delayed_bug
     }
 
     /// Performs lint checking for the module.
@@ -1777,7 +1777,7 @@ rustc_queries! {
         depth_limit
         desc { "computing layout of `{}`", key.value }
         // we emit our own error during query cycle handling
-        cycle_delay_bug
+        cycle_delayed_bug
     }
 
     /// Compute a `FnAbi` suitable for indirect calls, i.e. to `fn` pointers.

compiler/rustc_middle/src/query/modifiers.rs

@@ -23,10 +23,10 @@ pub(crate) struct arena_cache;
 /// Cache the query to disk if the `Block` returns true.
 pub(crate) struct cache_on_disk_if;
 
-/// # `cycle_delay_bug` query modifier
+/// # `cycle_delayed_bug` query modifier
 ///
 /// A cycle error results in a delay_bug call
-pub(crate) struct cycle_delay_bug;
+pub(crate) struct cycle_delayed_bug;
 
 /// # `cycle_stash` query modifier
 ///

compiler/rustc_middle/src/query/plumbing.rs

@@ -57,7 +57,7 @@ pub enum ActiveKeyStatus<'tcx> {
 #[derive(Copy, Clone)]
 pub enum CycleErrorHandling {
     Error,
-    DelayBug,
+    DelayedBug,
     Stash,
 }
 

compiler/rustc_query_impl/src/execution.rs

@@ -131,7 +131,7 @@ fn mk_cycle<'tcx, C: QueryCache>(
             let guar = error.emit();
             (query.value_from_cycle_error)(tcx, cycle_error, guar)
         }
-        CycleErrorHandling::DelayBug => {
+        CycleErrorHandling::DelayedBug => {
             let guar = error.delay_as_bug();
             (query.value_from_cycle_error)(tcx, cycle_error, guar)
         }