Rename Storage as QueryCache.

Because `Storage` is a vague name that I've never liked.

`QueryCache` is also used for a trait. The name reuse isn't ideal, but
it doesn't cause problems and I can't think of a better name in either
case than `QueryCache`.

Author: nnethercote

compiler/rustc_middle/src/query/plumbing.rs

@@ -442,7 +442,7 @@ macro_rules! define_callbacks {
                     erase::erase_val(value)
                 }
 
-                pub type Storage<'tcx> =
+                pub type QueryCache<'tcx> =
                     <Key<'tcx> as $crate::query::QueryKey>::Cache<Erased<Value<'tcx>>>;
 
                 // Ensure that keys grow no larger than 88 bytes by accident.
@@ -590,7 +590,8 @@ macro_rules! define_callbacks {
         /// Holds a `QueryVTable` for each query.
         pub struct QueryVTables<'tcx> {
             $(
-                pub $name: ::rustc_middle::query::plumbing::QueryVTable<'tcx, $name::Storage<'tcx>>,
+                pub $name:
+                    ::rustc_middle::query::plumbing::QueryVTable<'tcx, $name::QueryCache<'tcx>>,
             )*
         }
 

compiler/rustc_query_impl/src/plumbing.rs

@@ -550,7 +550,7 @@ macro_rules! define_queries {
             }
 
             pub(crate) fn make_query_vtable<'tcx>(incremental: bool)
-                -> QueryVTable<'tcx, queries::$name::Storage<'tcx>>
+                -> QueryVTable<'tcx, queries::$name::QueryCache<'tcx>>
             {
                 QueryVTable {
                     name: stringify!($name),
@@ -616,7 +616,7 @@ macro_rules! define_queries {
             pub(crate) enum VTableGetter {}
 
             impl<'tcx> GetQueryVTable<'tcx> for VTableGetter {
-                type Cache = rustc_middle::queries::$name::Storage<'tcx>;
+                type Cache = rustc_middle::queries::$name::QueryCache<'tcx>;
 
                 #[inline(always)]
                 fn query_vtable(tcx: TyCtxt<'tcx>) -> &'tcx QueryVTable<'tcx, Self::Cache> {