diff options
| author | Joshua Nelson <jnelson@cloudflare.com> | 2022-08-24 00:22:27 -0500 |
|---|---|---|
| committer | Joshua Nelson <jnelson@cloudflare.com> | 2022-08-24 00:37:49 -0500 |
| commit | b061550ed351751db4bb3dcc356f44daa9a3542d (patch) | |
| tree | 4a062d0040f7185f564cfca766b0e51b767293f6 | |
| parent | 7b8e2a52ff29d400b4d869fad1d917ffa9bdce59 (diff) | |
| download | rust-b061550ed351751db4bb3dcc356f44daa9a3542d.tar.gz rust-b061550ed351751db4bb3dcc356f44daa9a3542d.zip | |
Remove the `$tcx:tt` parameter from `rustc_query_description`
It's unnecessary.
| -rw-r--r-- | compiler/rustc_macros/src/query.rs | 10 | ||||
| -rw-r--r-- | compiler/rustc_query_impl/src/plumbing.rs | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/compiler/rustc_macros/src/query.rs b/compiler/rustc_macros/src/query.rs index d80d35cb1fa..cfbc80b9756 100644 --- a/compiler/rustc_macros/src/query.rs +++ b/compiler/rustc_macros/src/query.rs @@ -258,13 +258,13 @@ fn add_query_description_impl(query: &Query, impls: &mut proc_macro2::TokenStrea let try_load_from_disk = if let Some((tcx, id, block)) = modifiers.load_cached.as_ref() { // Use custom code to load the query from disk quote! { - const TRY_LOAD_FROM_DISK: Option<fn(QueryCtxt<$tcx>, SerializedDepNodeIndex) -> Option<Self::Value>> + const TRY_LOAD_FROM_DISK: Option<fn(QueryCtxt<'tcx>, SerializedDepNodeIndex) -> Option<Self::Value>> = Some(|#tcx, #id| { #block }); } } else { // Use the default code to load the query from disk quote! { - const TRY_LOAD_FROM_DISK: Option<fn(QueryCtxt<$tcx>, SerializedDepNodeIndex) -> Option<Self::Value>> + const TRY_LOAD_FROM_DISK: Option<fn(QueryCtxt<'tcx>, SerializedDepNodeIndex) -> Option<Self::Value>> = Some(|tcx, id| tcx.on_disk_cache().as_ref()?.try_load_query_result(*tcx, id)); } }; @@ -291,7 +291,7 @@ fn add_query_description_impl(query: &Query, impls: &mut proc_macro2::TokenStrea false } - const TRY_LOAD_FROM_DISK: Option<fn(QueryCtxt<$tcx>, SerializedDepNodeIndex) -> Option<Self::Value>> = None; + const TRY_LOAD_FROM_DISK: Option<fn(QueryCtxt<'tcx>, SerializedDepNodeIndex) -> Option<Self::Value>> = None; } }; @@ -300,7 +300,7 @@ fn add_query_description_impl(query: &Query, impls: &mut proc_macro2::TokenStrea let desc = quote! { #[allow(unused_variables)] - fn describe(tcx: QueryCtxt<$tcx>, key: Self::Key) -> String { + fn describe(tcx: QueryCtxt<'tcx>, key: Self::Key) -> String { let (#tcx, #key) = (*tcx, key); ::rustc_middle::ty::print::with_no_trimmed_paths!( format!(#desc) @@ -309,7 +309,7 @@ fn add_query_description_impl(query: &Query, impls: &mut proc_macro2::TokenStrea }; impls.extend(quote! { - (#name<$tcx:tt>) => { + (#name) => { #desc #cache }; diff --git a/compiler/rustc_query_impl/src/plumbing.rs b/compiler/rustc_query_impl/src/plumbing.rs index 7b4ff850df6..462f9a42aea 100644 --- a/compiler/rustc_query_impl/src/plumbing.rs +++ b/compiler/rustc_query_impl/src/plumbing.rs @@ -322,7 +322,7 @@ macro_rules! define_queries { } impl<'tcx> QueryDescription<QueryCtxt<'tcx>> for queries::$name<'tcx> { - rustc_query_description! { $name<'tcx> } + rustc_query_description! { $name } type Cache = query_storage::$name<'tcx>; |
