bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Merge builtins into LateLintPassObjects.

Browse source 
This avoids calling the `late_lint_{mod_pass,pass_crate}` twice.
This commit is contained in:
Nicholas Nethercote 2022-12-01 12:10:23 +11:00
parent 99e9c1ddb7
commit 890c5ead20
1 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
compiler/rustc_lint/src/late.rs
View file

@ -358,19 +358,16 @@ fn late_lint_mod_pass<'tcx, T: LateLintPass<'tcx>>(
} }
} }
pub fn late_lint_mod<'tcx, T: LateLintPass<'tcx>>( pub fn late_lint_mod<'tcx, T: LateLintPass<'tcx> + 'tcx>(
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
module_def_id: LocalDefId, module_def_id: LocalDefId,
builtin_lints: T, builtin_lints: T,
) { ) {
late_lint_mod_pass(tcx, module_def_id, builtin_lints);
let mut passes: Vec<_> = let mut passes: Vec<_> =
unerased_lint_store(tcx).late_module_passes.iter().map(|pass| (pass)(tcx)).collect(); unerased_lint_store(tcx).late_module_passes.iter().map(|pass| (pass)(tcx)).collect();
passes.push(Box::new(builtin_lints));
if !passes.is_empty() { late_lint_mod_pass(tcx, module_def_id, LateLintPassObjects { lints: &mut passes[..] });
late_lint_mod_pass(tcx, module_def_id, LateLintPassObjects { lints: &mut passes[..] });
}
} }
fn late_lint_pass_crate<'tcx, T: LateLintPass<'tcx>>(tcx: TyCtxt<'tcx>, pass: T) { fn late_lint_pass_crate<'tcx, T: LateLintPass<'tcx>>(tcx: TyCtxt<'tcx>, pass: T) {
@ -401,19 +398,16 @@ fn late_lint_pass_crate<'tcx, T: LateLintPass<'tcx>>(tcx: TyCtxt<'tcx>, pass: T)
}) })
} }
fn late_lint_crate<'tcx, T: LateLintPass<'tcx>>(tcx: TyCtxt<'tcx>, builtin_lints: T) { fn late_lint_crate<'tcx, T: LateLintPass<'tcx> + 'tcx>(tcx: TyCtxt<'tcx>, builtin_lints: T) {
let mut passes = let mut passes =
unerased_lint_store(tcx).late_passes.iter().map(|p| (p)(tcx)).collect::<Vec<_>>(); unerased_lint_store(tcx).late_passes.iter().map(|p| (p)(tcx)).collect::<Vec<_>>();
passes.push(Box::new(builtin_lints));
if !passes.is_empty() { late_lint_pass_crate(tcx, LateLintPassObjects { lints: &mut passes[..] });
late_lint_pass_crate(tcx, LateLintPassObjects { lints: &mut passes[..] });
}
late_lint_pass_crate(tcx, builtin_lints);
} }
/// Performs lint checking on a crate. /// Performs lint checking on a crate.
pub fn check_crate<'tcx, T: LateLintPass<'tcx>>( pub fn check_crate<'tcx, T: LateLintPass<'tcx> + 'tcx>(
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
builtin_lints: impl FnOnce() -> T + Send, builtin_lints: impl FnOnce() -> T + Send,
) { ) {