Skip to content

Commit f4b72dc

Browse files
jdonszelmannjdonszelmann
committed
Move two attribute lints to be early pass (post expansion)
1 parent ca87b53 commit f4b72dc

15 files changed

+122
-112
lines changed

‎src/tools/clippy/clippy_lints/src/attrs/allow_attributes.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ use clippy_utils::diagnostics::span_lint_and_then;
33
use clippy_utils::is_from_proc_macro;
44
use rustc_ast::{AttrStyle, Attribute};
55
use rustc_errors::Applicability;
6-
use rustc_lint::{LateContext, LintContext};
6+
use rustc_lint::{EarlyContext, LintContext};
77
use rustc_middle::lint::in_external_macro;
88

99
// Separate each crate's features.
10-
pub fn check<'cx>(cx: &LateContext<'cx>, attr: &'cx Attribute) {
10+
pub fn check<'cx>(cx: &EarlyContext<'cx>, attr: &'cx Attribute) {
1111
if !in_external_macro(cx.sess(), attr.span)
1212
&& let AttrStyle::Outer = attr.style
1313
&& let Some(ident) = attr.ident()

‎src/tools/clippy/clippy_lints/src/attrs/allow_attributes_without_reason.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ use super::{ALLOW_ATTRIBUTES_WITHOUT_REASON, Attribute};
22
use clippy_utils::diagnostics::span_lint_and_then;
33
use clippy_utils::is_from_proc_macro;
44
use rustc_ast::{MetaItemInner, MetaItemKind};
5-
use rustc_lint::{LateContext, LintContext};
5+
use rustc_lint::{EarlyContext, LintContext};
66
use rustc_middle::lint::in_external_macro;
77
use rustc_span::sym;
88
use rustc_span::symbol::Symbol;
99

10-
pub(super) fn check<'cx>(cx: &LateContext<'cx>, name: Symbol, items: &[MetaItemInner], attr: &'cx Attribute) {
10+
pub(super) fn check<'cx>(cx: &EarlyContext<'cx>, name: Symbol, items: &[MetaItemInner], attr: &'cx Attribute) {
1111
// Check if the reason is present
1212
if let Some(item) = items.last().and_then(MetaItemInner::meta_item)
1313
&& let MetaItemKind::NameValue(_) = &item.kind

‎src/tools/clippy/clippy_lints/src/attrs/blanket_clippy_restriction_lints.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ use super::BLANKET_CLIPPY_RESTRICTION_LINTS;
22
use super::utils::extract_clippy_lint;
33
use clippy_utils::diagnostics::{span_lint_and_help, span_lint_and_then};
44
use rustc_ast::MetaItemInner;
5-
use rustc_lint::{LateContext, Level, LintContext};
5+
use rustc_lint::{EarlyContext, Level, LintContext};
66
use rustc_span::symbol::Symbol;
77
use rustc_span::{DUMMY_SP, sym};
88

9-
pub(super) fn check(cx: &LateContext<'_>, name: Symbol, items: &[MetaItemInner]) {
9+
pub(super) fn check(cx: &EarlyContext<'_>, name: Symbol, items: &[MetaItemInner]) {
1010
for lint in items {
1111
if let Some(lint_name) = extract_clippy_lint(lint) {
1212
if lint_name.as_str() == "restriction" && name != sym::allow {
@@ -23,7 +23,7 @@ pub(super) fn check(cx: &LateContext<'_>, name: Symbol, items: &[MetaItemInner])
2323
}
2424
}
2525

26-
pub(super) fn check_command_line(cx: &LateContext<'_>) {
26+
pub(super) fn check_command_line(cx: &EarlyContext<'_>) {
2727
for (name, level) in &cx.sess().opts.lint_opts {
2828
if name == "clippy::restriction" && *level > Level::Allow {
2929
span_lint_and_then(

‎src/tools/clippy/clippy_lints/src/attrs/deprecated_semver.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use super::DEPRECATED_SEMVER;
22
use clippy_utils::diagnostics::span_lint;
33
use rustc_ast::{LitKind, MetaItemLit};
4-
use rustc_lint::LateContext;
4+
use rustc_lint::EarlyContext;
55
use rustc_span::Span;
66
use semver::Version;
77

8-
pub(super) fn check(cx: &LateContext<'_>, span: Span, lit: &MetaItemLit) {
8+
pub(super) fn check(cx: &EarlyContext<'_>, span: Span, lit: &MetaItemLit) {
99
if let LitKind::Str(is, _) = lit.kind {
1010
if is.as_str() == "TBD" || Version::parse(is.as_str()).is_ok() {
1111
return;

‎src/tools/clippy/clippy_lints/src/attrs/duplicated_attributes.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ use super::DUPLICATED_ATTRIBUTES;
22
use clippy_utils::diagnostics::span_lint_and_then;
33
use rustc_ast::{Attribute, MetaItem};
44
use rustc_data_structures::fx::FxHashMap;
5-
use rustc_lint::LateContext;
5+
use rustc_lint::EarlyContext;
66
use rustc_span::{Span, sym};
77
use std::collections::hash_map::Entry;
88

99
fn emit_if_duplicated(
10-
cx: &LateContext<'_>,
10+
cx: &EarlyContext<'_>,
1111
attr: &MetaItem,
1212
attr_paths: &mut FxHashMap<String, Span>,
1313
complete_path: String,
@@ -26,7 +26,7 @@ fn emit_if_duplicated(
2626
}
2727

2828
fn check_duplicated_attr(
29-
cx: &LateContext<'_>,
29+
cx: &EarlyContext<'_>,
3030
attr: &MetaItem,
3131
attr_paths: &mut FxHashMap<String, Span>,
3232
parent: &mut Vec<String>,
@@ -65,7 +65,7 @@ fn check_duplicated_attr(
6565
}
6666
}
6767

68-
pub fn check(cx: &LateContext<'_>, attrs: &[Attribute]) {
68+
pub fn check(cx: &EarlyContext<'_>, attrs: &[Attribute]) {
6969
let mut attr_paths = FxHashMap::default();
7070

7171
for attr in attrs {

‎src/tools/clippy/clippy_lints/src/attrs/mixed_attributes_style.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use clippy_utils::diagnostics::span_lint;
33
use rustc_ast::{AttrKind, AttrStyle, Attribute};
44
use rustc_data_structures::fx::FxHashSet;
55
use rustc_data_structures::sync::Lrc;
6-
use rustc_lint::{LateContext, LintContext};
6+
use rustc_lint::{EarlyContext, LintContext};
77
use rustc_span::source_map::SourceMap;
88
use rustc_span::{SourceFile, Span, Symbol};
99

@@ -32,7 +32,7 @@ impl From<&AttrKind> for SimpleAttrKind {
3232
}
3333
}
3434

35-
pub(super) fn check(cx: &LateContext<'_>, item_span: Span, attrs: &[Attribute]) {
35+
pub(super) fn check(cx: &EarlyContext<'_>, item_span: Span, attrs: &[Attribute]) {
3636
let mut inner_attr_kind: FxHashSet<SimpleAttrKind> = FxHashSet::default();
3737
let mut outer_attr_kind: FxHashSet<SimpleAttrKind> = FxHashSet::default();
3838

@@ -64,7 +64,7 @@ pub(super) fn check(cx: &LateContext<'_>, item_span: Span, attrs: &[Attribute])
6464
}
6565
}
6666

67-
fn lint_mixed_attrs(cx: &LateContext<'_>, attrs: &[Attribute]) {
67+
fn lint_mixed_attrs(cx: &EarlyContext<'_>, attrs: &[Attribute]) {
6868
let mut attrs_iter = attrs.iter().filter(|attr| !attr.span.from_expansion());
6969
let span = if let (Some(first), Some(last)) = (attrs_iter.next(), attrs_iter.last()) {
7070
first.span.with_hi(last.span.hi())

‎src/tools/clippy/clippy_lints/src/attrs/mod.rs

+76-52
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ mod utils;
1414

1515
use clippy_config::Conf;
1616
use clippy_config::msrvs::{self, Msrv};
17-
use rustc_ast::{Attribute, MetaItemInner, MetaItemKind};
18-
use rustc_hir::{ImplItem, Item, ItemKind, TraitItem};
17+
use rustc_ast::{Attribute, MetaItemInner, MetaItemKind, self as ast};
18+
use rustc_hir::{ImplItem, Item, TraitItem};
1919
use rustc_lint::{EarlyContext, EarlyLintPass, LateContext, LateLintPass};
2020
use rustc_session::impl_lint_pass;
2121
use rustc_span::sym;
@@ -414,15 +414,7 @@ pub struct Attributes {
414414
}
415415

416416
impl_lint_pass!(Attributes => [
417-
ALLOW_ATTRIBUTES,
418-
ALLOW_ATTRIBUTES_WITHOUT_REASON,
419417
INLINE_ALWAYS,
420-
DEPRECATED_SEMVER,
421-
USELESS_ATTRIBUTE,
422-
BLANKET_CLIPPY_RESTRICTION_LINTS,
423-
SHOULD_PANIC_WITHOUT_EXPECT,
424-
MIXED_ATTRIBUTES_STYLE,
425-
DUPLICATED_ATTRIBUTES,
426418
]);
427419

428420
impl Attributes {
@@ -434,53 +426,11 @@ impl Attributes {
434426
}
435427

436428
impl<'tcx> LateLintPass<'tcx> for Attributes {
437-
fn check_crate(&mut self, cx: &LateContext<'tcx>) {
438-
blanket_clippy_restriction_lints::check_command_line(cx);
439-
duplicated_attributes::check(cx, cx.tcx.hir().krate_attrs());
440-
}
441-
442-
fn check_attribute(&mut self, cx: &LateContext<'tcx>, attr: &'tcx Attribute) {
443-
if let Some(items) = &attr.meta_item_list() {
444-
if let Some(ident) = attr.ident() {
445-
if is_lint_level(ident.name, attr.id) {
446-
blanket_clippy_restriction_lints::check(cx, ident.name, items);
447-
}
448-
if matches!(ident.name, sym::allow) && self.msrv.meets(msrvs::LINT_REASONS_STABILIZATION) {
449-
allow_attributes::check(cx, attr);
450-
}
451-
if matches!(ident.name, sym::allow | sym::expect) && self.msrv.meets(msrvs::LINT_REASONS_STABILIZATION)
452-
{
453-
allow_attributes_without_reason::check(cx, ident.name, items, attr);
454-
}
455-
if items.is_empty() || !attr.has_name(sym::deprecated) {
456-
return;
457-
}
458-
for item in items {
459-
if let MetaItemInner::MetaItem(mi) = &item
460-
&& let MetaItemKind::NameValue(lit) = &mi.kind
461-
&& mi.has_name(sym::since)
462-
{
463-
deprecated_semver::check(cx, item.span(), lit);
464-
}
465-
}
466-
}
467-
}
468-
if attr.has_name(sym::should_panic) {
469-
should_panic_without_expect::check(cx, attr);
470-
}
471-
}
472-
473429
fn check_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx Item<'_>) {
474430
let attrs = cx.tcx.hir().attrs(item.hir_id());
475431
if is_relevant_item(cx, item) {
476432
inline_always::check(cx, item.span, item.ident.name, attrs);
477433
}
478-
match item.kind {
479-
ItemKind::ExternCrate(..) | ItemKind::Use(..) => useless_attribute::check(cx, item, attrs),
480-
_ => {},
481-
}
482-
mixed_attributes_style::check(cx, item.span, attrs);
483-
duplicated_attributes::check(cx, attrs);
484434
}
485435

486436
fn check_impl_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx ImplItem<'_>) {
@@ -526,3 +476,77 @@ impl EarlyLintPass for EarlyAttributes {
526476

527477
extract_msrv_attr!(EarlyContext);
528478
}
479+
480+
pub struct PostExpansionEarlyAttributes {
481+
msrv: Msrv,
482+
}
483+
484+
impl PostExpansionEarlyAttributes {
485+
pub fn new(conf: &'static Conf) -> Self {
486+
Self {
487+
msrv: conf.msrv.clone(),
488+
}
489+
}
490+
}
491+
492+
impl_lint_pass!(PostExpansionEarlyAttributes => [
493+
ALLOW_ATTRIBUTES,
494+
ALLOW_ATTRIBUTES_WITHOUT_REASON,
495+
DEPRECATED_SEMVER,
496+
USELESS_ATTRIBUTE,
497+
BLANKET_CLIPPY_RESTRICTION_LINTS,
498+
SHOULD_PANIC_WITHOUT_EXPECT,
499+
MIXED_ATTRIBUTES_STYLE,
500+
DUPLICATED_ATTRIBUTES,
501+
]);
502+
503+
impl EarlyLintPass for PostExpansionEarlyAttributes {
504+
fn check_crate(&mut self, cx: &EarlyContext<'_>, krate: &ast::Crate) {
505+
blanket_clippy_restriction_lints::check_command_line(cx);
506+
duplicated_attributes::check(cx, &krate.attrs);
507+
}
508+
509+
fn check_attribute(&mut self, cx: &EarlyContext<'_>, attr: &Attribute) {
510+
if let Some(items) = &attr.meta_item_list() {
511+
if let Some(ident) = attr.ident() {
512+
if matches!(ident.name, sym::allow) && self.msrv.meets(msrvs::LINT_REASONS_STABILIZATION) {
513+
allow_attributes::check(cx, attr);
514+
}
515+
if matches!(ident.name, sym::allow | sym::expect) && self.msrv.meets(msrvs::LINT_REASONS_STABILIZATION)
516+
{
517+
allow_attributes_without_reason::check(cx, ident.name, items, attr);
518+
}
519+
if is_lint_level(ident.name, attr.id) {
520+
blanket_clippy_restriction_lints::check(cx, ident.name, items);
521+
}
522+
if items.is_empty() || !attr.has_name(sym::deprecated) {
523+
return;
524+
}
525+
for item in items {
526+
if let MetaItemInner::MetaItem(mi) = &item
527+
&& let MetaItemKind::NameValue(lit) = &mi.kind
528+
&& mi.has_name(sym::since)
529+
{
530+
deprecated_semver::check(cx, item.span(), lit);
531+
}
532+
}
533+
}
534+
}
535+
536+
if attr.has_name(sym::should_panic) {
537+
should_panic_without_expect::check(cx, attr);
538+
}
539+
}
540+
541+
fn check_item(&mut self, cx: &EarlyContext<'_>, item: &'_ ast::Item) {
542+
match item.kind {
543+
ast::ItemKind::ExternCrate(..) | ast::ItemKind::Use(..) => useless_attribute::check(cx, item, &item.attrs),
544+
_ => {},
545+
}
546+
547+
mixed_attributes_style::check(cx, item.span, &item.attrs);
548+
duplicated_attributes::check(cx, &item.attrs);
549+
}
550+
551+
extract_msrv_attr!(EarlyContext);
552+
}

‎src/tools/clippy/clippy_lints/src/attrs/should_panic_without_expect.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ use rustc_ast::token::{Token, TokenKind};
44
use rustc_ast::tokenstream::TokenTree;
55
use rustc_ast::{AttrArgs, AttrArgsEq, AttrKind};
66
use rustc_errors::Applicability;
7-
use rustc_lint::LateContext;
7+
use rustc_lint::EarlyContext;
88
use rustc_span::sym;
99

10-
pub(super) fn check(cx: &LateContext<'_>, attr: &Attribute) {
10+
pub(super) fn check(cx: &EarlyContext<'_>, attr: &Attribute) {
1111
if let AttrKind::Normal(normal_attr) = &attr.kind {
12-
if let AttrArgs::Eq(_, AttrArgsEq::Hir(_)) = &normal_attr.item.args {
12+
if let AttrArgs::Eq(_, AttrArgsEq::Ast(_)) = &normal_attr.item.args {
1313
// `#[should_panic = ".."]` found, good
1414
return;
1515
}

‎src/tools/clippy/clippy_lints/src/attrs/useless_attribute.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
use super::utils::{extract_clippy_lint, is_lint_level, is_word};
2-
use super::{Attribute, USELESS_ATTRIBUTE};
2+
use super::USELESS_ATTRIBUTE;
33
use clippy_utils::diagnostics::span_lint_and_then;
44
use clippy_utils::source::{SpanRangeExt, first_line_of_span};
55
use rustc_ast::MetaItemInner;
66
use rustc_errors::Applicability;
7-
use rustc_hir::{Item, ItemKind};
8-
use rustc_lint::{LateContext, LintContext};
7+
use rustc_ast::{Item, ItemKind, Attribute};
8+
use rustc_lint::{EarlyContext, LintContext};
99
use rustc_middle::lint::in_external_macro;
1010
use rustc_span::sym;
1111

12-
pub(super) fn check(cx: &LateContext<'_>, item: &Item<'_>, attrs: &[Attribute]) {
12+
pub(super) fn check(cx: &EarlyContext<'_>, item: &Item, attrs: &[Attribute]) {
1313
let skip_unused_imports = attrs.iter().any(|attr| attr.has_name(sym::macro_use));
1414

1515
for attr in attrs {

‎src/tools/clippy/clippy_lints/src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,8 @@ use rustc_lint::{Lint, LintId};
412412
pub fn register_pre_expansion_lints(store: &mut rustc_lint::LintStore, conf: &'static Conf) {
413413
// NOTE: Do not add any more pre-expansion passes. These should be removed eventually.
414414
store.register_pre_expansion_pass(move || Box::new(attrs::EarlyAttributes::new(conf)));
415+
416+
store.register_early_pass(move || Box::new(attrs::PostExpansionEarlyAttributes::new(conf)));
415417
}
416418

417419
#[derive(Default)]

‎src/tools/clippy/clippy_utils/src/check_proc_macro.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use rustc_hir::{
2121
ImplItem, ImplItemKind, IsAuto, Item, ItemKind, Lit, LoopSource, MatchSource, MutTy, Node, Path, QPath, Safety,
2222
TraitItem, TraitItemKind, Ty, TyKind, UnOp, UnsafeSource, Variant, VariantData, YieldSource,
2323
};
24-
use rustc_lint::{LateContext, LintContext};
24+
use rustc_lint::{LateContext, LintContext, EarlyContext};
2525
use rustc_middle::ty::TyCtxt;
2626
use rustc_session::Session;
2727
use rustc_span::symbol::{Ident, kw};
@@ -429,11 +429,12 @@ impl_with_search_pat!((_cx: LateContext<'tcx>, self: ImplItem<'_>) => impl_item_
429429
impl_with_search_pat!((_cx: LateContext<'tcx>, self: FieldDef<'_>) => field_def_search_pat(self));
430430
impl_with_search_pat!((_cx: LateContext<'tcx>, self: Variant<'_>) => variant_search_pat(self));
431431
impl_with_search_pat!((_cx: LateContext<'tcx>, self: Ty<'_>) => ty_search_pat(self));
432-
impl_with_search_pat!((_cx: LateContext<'tcx>, self: Attribute) => attr_search_pat(self));
433432
impl_with_search_pat!((_cx: LateContext<'tcx>, self: Ident) => ident_search_pat(*self));
434433
impl_with_search_pat!((_cx: LateContext<'tcx>, self: Lit) => lit_search_pat(&self.node));
435434
impl_with_search_pat!((_cx: LateContext<'tcx>, self: Path<'_>) => path_search_pat(self));
436435

436+
impl_with_search_pat!((_cx: EarlyContext<'tcx>, self: Attribute) => attr_search_pat(self));
437+
437438
impl<'cx> WithSearchPat<'cx> for (&FnKind<'cx>, &Body<'cx>, HirId, Span) {
438439
type Context = LateContext<'cx>;
439440

‎src/tools/clippy/tests/ui/allow_attributes.stderr

+1-9
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,5 @@ error: #[allow] attribute found
1919
LL | #[allow(unused)]
2020
| ^^^^^ help: replace it with: `expect`
2121

22-
error: #[allow] attribute found
23-
--> tests/ui/allow_attributes.rs:52:7
24-
|
25-
LL | #[allow(unused)]
26-
| ^^^^^ help: replace it with: `expect`
27-
|
28-
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
29-
30-
error: aborting due to 4 previous errors
22+
error: aborting due to 3 previous errors
3123

‎src/tools/clippy/tests/ui/allow_attributes_without_reason.stderr

+1-10
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,5 @@ LL | #[allow(unused)]
4343
|
4444
= help: try adding a reason at the end with `, reason = ".."`
4545

46-
error: `allow` attribute without specifying a reason
47-
--> tests/ui/allow_attributes_without_reason.rs:46:5
48-
|
49-
LL | #[allow(unused)]
50-
| ^^^^^^^^^^^^^^^^
51-
|
52-
= help: try adding a reason at the end with `, reason = ".."`
53-
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
54-
55-
error: aborting due to 6 previous errors
46+
error: aborting due to 5 previous errors
5647

0 commit comments

Comments
 (0)