Skip to content

Commit 9d15abe

Browse files
committed
Use () for lint_levels.
1 parent b7bf467 commit 9d15abe

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

compiler/rustc_lint/src/levels.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ use rustc_ast_pretty::pprust;
66
use rustc_data_structures::fx::FxHashMap;
77
use rustc_errors::{struct_span_err, Applicability, DiagnosticBuilder};
88
use rustc_hir as hir;
9-
use rustc_hir::def_id::{CrateNum, DefId, CRATE_DEF_INDEX, LOCAL_CRATE};
10-
use rustc_hir::{intravisit, HirId};
9+
use rustc_hir::{intravisit, HirId, CRATE_HIR_ID};
1110
use rustc_middle::hir::map::Map;
1211
use rustc_middle::lint::LevelAndSource;
1312
use rustc_middle::lint::LintDiagnosticBuilder;
@@ -28,10 +27,9 @@ use tracing::debug;
2827

2928
use std::cmp;
3029

31-
fn lint_levels(tcx: TyCtxt<'_>, cnum: CrateNum) -> LintLevelMap {
32-
assert_eq!(cnum, LOCAL_CRATE);
30+
fn lint_levels(tcx: TyCtxt<'_>, (): ()) -> LintLevelMap {
3331
let store = unerased_lint_store(tcx);
34-
let crate_attrs = tcx.get_attrs(DefId { krate: cnum, index: CRATE_DEF_INDEX });
32+
let crate_attrs = tcx.hir().attrs(CRATE_HIR_ID);
3533
let levels = LintLevelsBuilder::new(tcx.sess, false, &store, crate_attrs);
3634
let mut builder = LintLevelMapBuilder { levels, tcx, store };
3735
let krate = tcx.hir().krate();

compiler/rustc_middle/src/query/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ rustc_queries! {
199199
desc { "looking up the native libraries of a linked crate" }
200200
}
201201

202-
query lint_levels(_: CrateNum) -> LintLevelMap {
202+
query lint_levels(_: ()) -> LintLevelMap {
203203
storage(ArenaCacheSelector<'tcx>)
204204
eval_always
205205
desc { "computing the lint levels for items in this crate" }

compiler/rustc_middle/src/ty/context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2623,7 +2623,7 @@ impl<'tcx> TyCtxt<'tcx> {
26232623
lint: &'static Lint,
26242624
mut id: hir::HirId,
26252625
) -> (Level, LintLevelSource) {
2626-
let sets = self.lint_levels(LOCAL_CRATE);
2626+
let sets = self.lint_levels(());
26272627
loop {
26282628
if let Some(pair) = sets.level_and_source(lint, id, self.sess) {
26292629
return pair;

0 commit comments

Comments
 (0)