Rename cache_on_disk variables.

To `cache_on_disk_if` to match the query modifier name.

Author: nnethercote

compiler/rustc_macros/src/query.rs

@@ -256,7 +256,7 @@ fn make_modifiers_stream(query: &Query, modifiers: &QueryModifiers) -> proc_macr
 
     let anon = anon.is_some();
     let arena_cache = arena_cache.is_some();
-    let cache_on_disk = cache_on_disk_if.is_some();
+    let cache_on_disk_if = cache_on_disk_if.is_some();
 
     let cycle_error_handling = if cycle_delayed_bug.is_some() {
         quote! { DelayedBug }
@@ -283,7 +283,7 @@ fn make_modifiers_stream(query: &Query, modifiers: &QueryModifiers) -> proc_macr
         // tidy-alphabetical-start
         anon: #anon,
         arena_cache: #arena_cache,
-        cache_on_disk: #cache_on_disk,
+        cache_on_disk_if: #cache_on_disk_if,
         cycle_error_handling: #cycle_error_handling,
         depth_limit: #depth_limit,
         eval_always: #eval_always,

compiler/rustc_middle/src/query/plumbing.rs

@@ -344,7 +344,7 @@ macro_rules! define_callbacks {
                     // Search for (QMODLIST) to find all occurrences of this query modifier list.
                     anon: $anon:literal,
                     arena_cache: $arena_cache:literal,
-                    cache_on_disk: $cache_on_disk:literal,
+                    cache_on_disk_if: $cache_on_disk_if:literal,
                     cycle_error_handling: $cycle_error_handling:ident,
                     depth_limit: $depth_limit:literal,
                     eval_always: $eval_always:literal,

compiler/rustc_query_impl/src/dep_kind_vtables.rs

@@ -135,7 +135,7 @@ macro_rules! define_dep_kind_vtables {
                     // Search for (QMODLIST) to find all occurrences of this query modifier list.
                     anon: $anon:literal,
                     arena_cache: $arena_cache:literal,
-                    cache_on_disk: $cache_on_disk:literal,
+                    cache_on_disk_if: $cache_on_disk_if:literal,
                     cycle_error_handling: $cycle_error_handling:ident,
                     depth_limit: $depth_limit:literal,
                     eval_always: $eval_always:literal,
@@ -167,7 +167,7 @@ macro_rules! define_dep_kind_vtables {
                     $crate::query_impl::$name::VTableGetter,
                 >(
                     $anon,
-                    $cache_on_disk,
+                    $cache_on_disk_if,
                     $eval_always,
                 )
             ),*

compiler/rustc_query_impl/src/plumbing.rs

@@ -307,7 +307,7 @@ macro_rules! define_queries {
                     // Search for (QMODLIST) to find all occurrences of this query modifier list.
                     anon: $anon:literal,
                     arena_cache: $arena_cache:literal,
-                    cache_on_disk: $cache_on_disk:literal,
+                    cache_on_disk_if: $cache_on_disk_if:literal,
                     cycle_error_handling: $cycle_error_handling:ident,
                     depth_limit: $depth_limit:literal,
                     eval_always: $eval_always:literal,
@@ -427,10 +427,10 @@ macro_rules! define_queries {
                     state: Default::default(),
                     cache: Default::default(),
 
-                    #[cfg($cache_on_disk)]
+                    #[cfg($cache_on_disk_if)]
                     will_cache_on_disk_for_key_fn:
                         Some(rustc_middle::queries::_cache_on_disk_if_fns::$name),
-                    #[cfg(not($cache_on_disk))]
+                    #[cfg(not($cache_on_disk_if))]
                     will_cache_on_disk_for_key_fn: None,
 
                     call_query_method_fn: |tcx, key| {
@@ -440,7 +440,7 @@ macro_rules! define_queries {
                     },
                     invoke_provider_fn: self::invoke_provider_fn::__rust_begin_short_backtrace,
 
-                    #[cfg($cache_on_disk)]
+                    #[cfg($cache_on_disk_if)]
                     try_load_from_disk_fn: Some(|tcx, key, prev_index, index| {
                         // Check the `cache_on_disk_if` condition for this key.
                         if !rustc_middle::queries::_cache_on_disk_if_fns::$name(tcx, key) {
@@ -453,15 +453,15 @@ macro_rules! define_queries {
                         // Arena-alloc the value if appropriate, and erase it.
                         Some(queries::$name::provided_to_erased(tcx, value))
                     }),
-                    #[cfg(not($cache_on_disk))]
+                    #[cfg(not($cache_on_disk_if))]
                     try_load_from_disk_fn: None,
 
-                    #[cfg($cache_on_disk)]
+                    #[cfg($cache_on_disk_if)]
                     is_loadable_from_disk_fn: Some(|tcx, key, index| -> bool {
                         rustc_middle::queries::_cache_on_disk_if_fns::$name(tcx, key) &&
                             $crate::plumbing::loadable_from_disk(tcx, index)
                     }),
-                    #[cfg(not($cache_on_disk))]
+                    #[cfg(not($cache_on_disk_if))]
                     is_loadable_from_disk_fn: None,
 
                     value_from_cycle_error: |tcx, cycle, guar| {
@@ -575,7 +575,7 @@ macro_rules! define_queries {
             query_result_index: &mut EncodedDepNodeIndex,
         ) {
             $(
-                #[cfg($cache_on_disk)]
+                #[cfg($cache_on_disk_if)]
                 {
                     $crate::plumbing::encode_query_results(
                         tcx,