Skip to content

Commit

Permalink
Unrolled build for rust-lang#132637
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#132637 - blyxyas:lint-less-passes, r=flip1995

Do not filter empty lint passes & re-do CTFE pass

Some structs implement `LintPass` without having a `Lint` associated with them rust-lang#125116 broke that behaviour by filtering them out. This PR ensures that lintless passes are not filtered out.
  • Loading branch information
rust-timer authored Nov 6, 2024
2 parents bc5cf99 + 2eac3c0 commit 6db5712
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 19 deletions.
3 changes: 3 additions & 0 deletions compiler/rustc_lint/src/late.rs
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,9 @@ fn late_lint_crate<'tcx>(tcx: TyCtxt<'tcx>) {
.into_iter()
.filter(|pass| {
let lints = (**pass).get_lints();
// Lintless passes are always in
lints.is_empty() ||
// If the pass doesn't have a single needed lint, omit it
!lints.iter().all(|lint| lints_that_dont_need_to_run.contains(&LintId::of(lint)))
})
.collect();
Expand Down
25 changes: 6 additions & 19 deletions src/tools/clippy/clippy_lints/src/ctfe.rs
Original file line number Diff line number Diff line change
@@ -1,29 +1,16 @@
use rustc_hir::def_id::LocalDefId;
use rustc_hir::intravisit::FnKind;
use rustc_hir::{Body, FnDecl};
use rustc_lint::Level::Deny;
use rustc_lint::{LateContext, LateLintPass, Lint};
use rustc_lint::{LateContext, LateLintPass};
use rustc_session::declare_lint_pass;
use rustc_span::Span;

/// Ensures that Constant-time Function Evaluation is being done (specifically, MIR lint passes).
/// As Clippy deactivates codegen, this lint ensures that CTFE (used in hard errors) is still ran.
pub static CLIPPY_CTFE: &Lint = &Lint {
name: &"clippy::CLIPPY_CTFE",
default_level: Deny,
desc: "Ensure CTFE is being made",
edition_lint_opts: None,
report_in_external_macro: true,
future_incompatible: None,
is_externally_loaded: true,
crate_level_only: false,
eval_always: true,
..Lint::default_fields_for_macro()
};

// No static CLIPPY_CTFE_INFO because we want this lint to be invisible

declare_lint_pass! { ClippyCtfe => [CLIPPY_CTFE] }
declare_lint_pass! {
/// Ensures that Constant-time Function Evaluation is being done (specifically, MIR lint passes).
/// As Clippy deactivates codegen, this lint ensures that CTFE (used in hard errors) is still ran.
ClippyCtfe => []
}

impl<'tcx> LateLintPass<'tcx> for ClippyCtfe {
fn check_fn(
Expand Down

0 comments on commit 6db5712

Please sign in to comment.