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

bors · bors · commit dd549dcab404 · 2021-11-25T19:43:56.000Z
Remove eval_always from upvars. Split off #86056 r? `@ghost`
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()) }

Original file line number	Diff line number	Diff line change
`@@ -1562,7 +1562,6 @@ rustc_queries! {`
`1562`	`1562`
`1563`	`1563`	`query upvars_mentioned(def_id: DefId) -> Option<&'tcx FxIndexMap<hir::HirId, hir::Upvar>> {`
`1564`	`1564`	desc { \|tcx\| "collecting upvars mentioned in `{}`", tcx.def_path_str(def_id) }
`1565`		`- eval_always`
`1566`	`1565`	`}`
`1567`	`1566`	`query maybe_unused_trait_import(def_id: LocalDefId) -> bool {`
`1568`	`1567`	desc { \|tcx\| "maybe_unused_trait_import for `{}`", tcx.def_path_str(def_id.to_def_id()) }