Skip to content

Commit

Permalink
Auto merge of #90579 - cjgillot:no-ee-ii, r=Aaron1011
Browse files Browse the repository at this point in the history
Remove eval_always for inherent_impls.

Split off #86056
r? `@ghost`
  • Loading branch information
bors committed Nov 24, 2021
2 parents 982c552 + c4d7beb commit c6a7ca1
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions compiler/rustc_middle/src/query/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down Expand Up @@ -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" }
}

Expand Down

0 comments on commit c6a7ca1

Please sign in to comment.