Skip to content

perf: skip nonstandard_macro_braces work when the lint is disabled #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
xmakro wants to merge 1 commit into from
Closed

perf: skip nonstandard_macro_braces work when the lint is disabled #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions clippy_lints/src/nonstandard_macro_braces.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use rustc_ast::ast;
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
use rustc_errors::Applicability;
use rustc_hir::def_id::DefId;
use rustc_lint::{EarlyContext, EarlyLintPass};
use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
use rustc_session::impl_lint_pass;
use rustc_span::Span;
use rustc_span::hygiene::{ExpnKind, MacroKind};
Expand Down Expand Up @@ -115,6 +115,19 @@ impl EarlyLintPass for MacroBraces {
}

fn is_offending_macro(cx: &EarlyContext<'_>, span: Span, mac_braces: &MacroBraces) -> Option<MacroInfo> {
let mut ctxt = span.ctxt();
// Most nodes in a crate aren't produced by a macro and never match below; bail before the
// lint-level lookup so the common (non-macro) case stays as cheap as it was originally.
if ctxt.is_root() {
return None;
}
// `NONSTANDARD_MACRO_BRACES` is allow-by-default. Now that we know this span came from a macro,
// a per-node lint-level lookup is worth it: when the lint isn't enabled here we can skip the
// macro-backtrace walk and brace-map lookups entirely, since nothing could be emitted anyway.
if cx.get_lint_level_spec(NONSTANDARD_MACRO_BRACES).is_allow() {
return None;
}

let unnested_or_local = |span: Span| {
!span.from_expansion()
|| span
Expand All @@ -123,7 +136,6 @@ fn is_offending_macro(cx: &EarlyContext<'_>, span: Span, mac_braces: &MacroBrace
.is_some_and(|e| e.macro_def_id.is_some_and(DefId::is_local))
};

let mut ctxt = span.ctxt();
while !ctxt.is_root() {
let expn_data = ctxt.outer_expn_data();
if let ExpnKind::Macro(MacroKind::Bang, mac_name) = expn_data.kind
Expand Down