about summary refs log tree commit diff
path: root/compiler/rustc_middle/src/query/mod.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-09-24 09:36:29 +0000
committerbors <bors@rust-lang.org>2022-09-24 09:36:29 +0000
commitbb5a01617589b5e3ece5a36435fc285bfd13c9a4 (patch)
tree7f58d400afb27079579bb5514eb71eff84f15967 /compiler/rustc_middle/src/query/mod.rs
parent199fe1d169b5aeeca0e527ded26542b7a05ebd79 (diff)
parentfc43df0333d5862a219f16d294ae38b14b9191d3 (diff)
downloadrust-bb5a01617589b5e3ece5a36435fc285bfd13c9a4.tar.gz
rust-bb5a01617589b5e3ece5a36435fc285bfd13c9a4.zip
Auto merge of #102064 - cjgillot:revert, r=Mark-Simulacrum
Revert perf-regression 101620

Reverts #101862 #101620

r? `@Mark-Simulacrum`
Diffstat (limited to 'compiler/rustc_middle/src/query/mod.rs')
-rw-r--r--compiler/rustc_middle/src/query/mod.rs10
1 files changed, 3 insertions, 7 deletions
diff --git a/compiler/rustc_middle/src/query/mod.rs b/compiler/rustc_middle/src/query/mod.rs
index b4ae13edf08..121a5b9f492 100644
--- a/compiler/rustc_middle/src/query/mod.rs
+++ b/compiler/rustc_middle/src/query/mod.rs
@@ -274,14 +274,10 @@ rustc_queries! {
         separate_provide_extern
     }
 
-    query shallow_lint_levels_on(key: HirId) -> rustc_middle::lint::ShallowLintLevelMap {
+    query lint_levels(_: ()) -> LintLevelMap {
         arena_cache
-        desc { |tcx| "looking up lint levels for `{}`", key }
-    }
-
-    query lint_expectations(_: ()) -> Vec<(LintExpectationId, LintExpectation)> {
-        arena_cache
-        desc { "computing `#[expect]`ed lints in this crate" }
+        eval_always
+        desc { "computing the lint levels for items in this crate" }
     }
 
     query parent_module_from_def_id(key: LocalDefId) -> LocalDefId {