about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-11-24 12:51:19 +0000
committerbors <bors@rust-lang.org>2021-11-24 12:51:19 +0000
commitc6a7ca196a707acd65e6cce1d337cd11786c59a5 (patch)
tree5589ec632692565977ce6ba5424dd92957e299f7
parent982c552c908d179eaa38b6ef152ad3fa30268778 (diff)
parentc4d7bebd950306b44e6820646ae9ea29404a5323 (diff)
downloadrust-c6a7ca196a707acd65e6cce1d337cd11786c59a5.tar.gz
rust-c6a7ca196a707acd65e6cce1d337cd11786c59a5.zip
Auto merge of #90579 - cjgillot:no-ee-ii, r=Aaron1011
Remove eval_always for inherent_impls.

Split off https://github.com/rust-lang/rust/pull/86056
r? `@ghost`
-rw-r--r--compiler/rustc_middle/src/query/mod.rs6
1 files changed, 1 insertions, 5 deletions
diff --git a/compiler/rustc_middle/src/query/mod.rs b/compiler/rustc_middle/src/query/mod.rs
index 9a58009a173..3e287e11ed1 100644
--- a/compiler/rustc_middle/src/query/mod.rs
+++ b/compiler/rustc_middle/src/query/mod.rs
@@ -649,7 +649,6 @@ rustc_queries! {
     /// Methods in these implementations don't need to be exported.
     query inherent_impls(key: DefId) -> &'tcx [DefId] {
         desc { |tcx| "collecting inherent impls for `{}`", tcx.def_path_str(key) }
-        eval_always
         separate_provide_extern
     }
 
@@ -810,15 +809,12 @@ rustc_queries! {
     /// Not meant to be used directly outside of coherence.
     query crate_inherent_impls(k: ()) -> CrateInherentImpls {
         storage(ArenaCacheSelector<'tcx>)
-        eval_always
         desc { "all inherent impls defined in crate" }
     }
 
     /// Checks all types in the crate for overlap in their inherent impls. Reports errors.
     /// Not meant to be used directly outside of coherence.
-    query crate_inherent_impls_overlap_check(_: ())
-        -> () {
-        eval_always
+    query crate_inherent_impls_overlap_check(_: ()) -> () {
         desc { "check for overlap between inherent impls defined in this crate" }
     }