Revert "Auto merge of #101620 - cjgillot:compute_lint_levels_by_def, r=oli-obk"

This reverts commit 2cb9a65684, reversing changes made to 750bd1a7ff.
2022-09-20 20:04:35 +02:00
parent 381bd2a836
commit fc43df0333
18 changed files with 497 additions and 679 deletions
--- 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 {