bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use () for lint_levels.

Browse source
This commit is contained in:
Camille GILLOT 2021-05-11 12:22:11 +02:00
parent b7bf467fa3
commit 9d15abe0cc
3 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_lint/src/levels.rs
View file

@ -6,8 +6,7 @@ use rustc_ast_pretty::pprust;
use rustc_data_structures::fx::FxHashMap; use rustc_data_structures::fx::FxHashMap;
use rustc_errors::{struct_span_err, Applicability, DiagnosticBuilder}; use rustc_errors::{struct_span_err, Applicability, DiagnosticBuilder};
use rustc_hir as hir; use rustc_hir as hir;
use rustc_hir::def_id::{CrateNum, DefId, CRATE_DEF_INDEX, LOCAL_CRATE}; use rustc_hir::{intravisit, HirId, CRATE_HIR_ID};
use rustc_hir::{intravisit, HirId};
use rustc_middle::hir::map::Map; use rustc_middle::hir::map::Map;
use rustc_middle::lint::LevelAndSource; use rustc_middle::lint::LevelAndSource;
use rustc_middle::lint::LintDiagnosticBuilder; use rustc_middle::lint::LintDiagnosticBuilder;
@ -28,10 +27,9 @@ use tracing::debug;
use std::cmp; use std::cmp;
fn lint_levels(tcx: TyCtxt<'_>, cnum: CrateNum) -> LintLevelMap { fn lint_levels(tcx: TyCtxt<'_>, (): ()) -> LintLevelMap {
assert_eq!(cnum, LOCAL_CRATE);
let store = unerased_lint_store(tcx); let store = unerased_lint_store(tcx);
let crate_attrs = tcx.get_attrs(DefId { krate: cnum, index: CRATE_DEF_INDEX }); let crate_attrs = tcx.hir().attrs(CRATE_HIR_ID);
let levels = LintLevelsBuilder::new(tcx.sess, false, &store, crate_attrs); let levels = LintLevelsBuilder::new(tcx.sess, false, &store, crate_attrs);
let mut builder = LintLevelMapBuilder { levels, tcx, store }; let mut builder = LintLevelMapBuilder { levels, tcx, store };
let krate = tcx.hir().krate(); let krate = tcx.hir().krate();

2
compiler/rustc_middle/src/query/mod.rs
View file

@ -199,7 +199,7 @@ rustc_queries! {
desc { "looking up the native libraries of a linked crate" } desc { "looking up the native libraries of a linked crate" }
} }
query lint_levels(_: CrateNum) -> LintLevelMap { query lint_levels(_: ()) -> LintLevelMap {
storage(ArenaCacheSelector<'tcx>) storage(ArenaCacheSelector<'tcx>)
eval_always eval_always
desc { "computing the lint levels for items in this crate" } desc { "computing the lint levels for items in this crate" }

2
compiler/rustc_middle/src/ty/context.rs
View file

@ -2623,7 +2623,7 @@ impl<'tcx> TyCtxt<'tcx> {
lint: &'static Lint, lint: &'static Lint,
mut id: hir::HirId, mut id: hir::HirId,
) -> (Level, LintLevelSource) { ) -> (Level, LintLevelSource) {
let sets = self.lint_levels(LOCAL_CRATE); let sets = self.lint_levels(());
loop { loop {
if let Some(pair) = sets.level_and_source(lint, id, self.sess) { if let Some(pair) = sets.level_and_source(lint, id, self.sess) {
return pair; return pair;