From ffb925c0f04cd2ba475ae923f92542a136ca3fbc Mon Sep 17 00:00:00 2001 From: Miguel Guarniz Date: Sun, 7 Aug 2022 13:54:01 -0400 Subject: [PATCH] Remove opt_remap_env_constness from rustc_query_impl Signed-off-by: Miguel Guarniz --- compiler/rustc_middle/src/ty/query.rs | 1 + compiler/rustc_query_impl/src/plumbing.rs | 12 +----------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/compiler/rustc_middle/src/ty/query.rs b/compiler/rustc_middle/src/ty/query.rs index 2452bcf6a61b..2911be819662 100644 --- a/compiler/rustc_middle/src/ty/query.rs +++ b/compiler/rustc_middle/src/ty/query.rs @@ -162,6 +162,7 @@ macro_rules! separate_provide_extern_default { }; } +#[macro_export] macro_rules! opt_remap_env_constness { ([][$name:ident]) => {}; ([(remap_env_constness) $($rest:tt)*][$name:ident]) => { diff --git a/compiler/rustc_query_impl/src/plumbing.rs b/compiler/rustc_query_impl/src/plumbing.rs index eda4401c81d0..5ebde81534b8 100644 --- a/compiler/rustc_query_impl/src/plumbing.rs +++ b/compiler/rustc_query_impl/src/plumbing.rs @@ -233,21 +233,11 @@ macro_rules! get_provider { }; } -macro_rules! opt_remap_env_constness { - ([][$name:ident]) => {}; - ([(remap_env_constness) $($rest:tt)*][$name:ident]) => { - let $name = $name.without_const(); - }; - ([$other:tt $($modifiers:tt)*][$name:ident]) => { - opt_remap_env_constness!([$($modifiers)*][$name]) - }; -} - macro_rules! define_queries { (<$tcx:tt> $($(#[$attr:meta])* [$($modifiers:tt)*] fn $name:ident($($K:tt)*) -> $V:ty,)*) => { - + use rustc_middle::opt_remap_env_constness; define_queries_struct! { tcx: $tcx, input: ($(([$($modifiers)*] [$($attr)*] [$name]))*)