Auto merge of rust-lang#90580 - cjgillot:no-ee-upvar, r=Aaron1011

Remove eval_always from upvars. Split off rust-lang#86056 r? `@ghost`
rust-lang-ci · Nov 25, 2021 · dd549dc · dd549dc
2 parents 37a4971 + 04f011f
commit dd549dc
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/compiler/rustc_middle/src/query/mod.rs b/compiler/rustc_middle/src/query/mod.rs
@@ -1562,7 +1562,6 @@ rustc_queries! {
 
     query upvars_mentioned(def_id: DefId) -> Option<&'tcx FxIndexMap<hir::HirId, hir::Upvar>> {
         desc { |tcx| "collecting upvars mentioned in `{}`", tcx.def_path_str(def_id) }
-        eval_always
     }
     query maybe_unused_trait_import(def_id: LocalDefId) -> bool {
         desc { |tcx| "maybe_unused_trait_import for `{}`", tcx.def_path_str(def_id.to_def_id()) }