Move two attribute lints to be early pass (post expansion)

Author: jdonszelmann

clippy_lints/src/attrs/allow_attributes.rs

@@ -3,11 +3,11 @@ use clippy_utils::diagnostics::span_lint_and_then;
 use clippy_utils::is_from_proc_macro;
 use rustc_ast::{AttrStyle,Attribute};
 use rustc_errors::Applicability;
-use rustc_lint::{LateContext,LintContext};
+use rustc_lint::{EarlyContext,LintContext};
 use rustc_middle::lint::in_external_macro;
 
 // Separate each crate's features.
-pubfncheck<'cx>(cx:&LateContext<'cx>,attr:&'cxAttribute){
+pubfncheck<'cx>(cx:&EarlyContext<'cx>,attr:&'cxAttribute){
 if !in_external_macro(cx.sess(), attr.span)
  && letAttrStyle::Outer = attr.style
  && letSome(ident) = attr.ident()

clippy_lints/src/attrs/allow_attributes_without_reason.rs

@@ -2,12 +2,12 @@ use super::{ALLOW_ATTRIBUTES_WITHOUT_REASON, Attribute};
 use clippy_utils::diagnostics::span_lint_and_then;
 use clippy_utils::is_from_proc_macro;
 use rustc_ast::{MetaItemInner,MetaItemKind};
-use rustc_lint::{LateContext,LintContext};
+use rustc_lint::{EarlyContext,LintContext};
 use rustc_middle::lint::in_external_macro;
 use rustc_span::sym;
 use rustc_span::symbol::Symbol;
 
-pub(super)fncheck<'cx>(cx:&LateContext<'cx>,name:Symbol,items:&[MetaItemInner],attr:&'cxAttribute){
+pub(super)fncheck<'cx>(cx:&EarlyContext<'cx>,name:Symbol,items:&[MetaItemInner],attr:&'cxAttribute){
 // Check if the reason is present
 ifletSome(item) = items.last().and_then(MetaItemInner::meta_item)
  && letMetaItemKind::NameValue(_) = &item.kind

clippy_lints/src/attrs/blanket_clippy_restriction_lints.rs

@@ -2,11 +2,11 @@ use super::BLANKET_CLIPPY_RESTRICTION_LINTS;
 usesuper::utils::extract_clippy_lint;
 use clippy_utils::diagnostics::{span_lint_and_help, span_lint_and_then};
 use rustc_ast::MetaItemInner;
-use rustc_lint::{LateContext,Level,LintContext};
+use rustc_lint::{EarlyContext,Level,LintContext};
 use rustc_span::symbol::Symbol;
 use rustc_span::{DUMMY_SP, sym};
 
-pub(super)fncheck(cx:&LateContext<'_>,name:Symbol,items:&[MetaItemInner]){
+pub(super)fncheck(cx:&EarlyContext<'_>,name:Symbol,items:&[MetaItemInner]){
 for lint in items {
 ifletSome(lint_name) = extract_clippy_lint(lint){
 if lint_name.as_str() == "restriction" && name != sym::allow {
@@ -23,7 +23,7 @@ pub(super) fn check(cx: &LateContext<'_>, name: Symbol, items: &[MetaItemInner])
 }
 }
 
-pub(super)fncheck_command_line(cx:&LateContext<'_>){
+pub(super)fncheck_command_line(cx:&EarlyContext<'_>){
 for(name, level)in&cx.sess().opts.lint_opts{
 if name == "clippy::restriction" && *level > Level::Allow{
 span_lint_and_then(

clippy_lints/src/attrs/deprecated_semver.rs

@@ -1,11 +1,11 @@
 usesuper::DEPRECATED_SEMVER;
 use clippy_utils::diagnostics::span_lint;
 use rustc_ast::{LitKind,MetaItemLit};
-use rustc_lint::LateContext;
+use rustc_lint::EarlyContext;
 use rustc_span::Span;
 use semver::Version;
 
-pub(super)fncheck(cx:&LateContext<'_>,span:Span,lit:&MetaItemLit){
+pub(super)fncheck(cx:&EarlyContext<'_>,span:Span,lit:&MetaItemLit){
 ifletLitKind::Str(is, _) = lit.kind{
 if is.as_str() == "TBD" || Version::parse(is.as_str()).is_ok(){
 return;

clippy_lints/src/attrs/duplicated_attributes.rs

@@ -2,12 +2,12 @@ use super::DUPLICATED_ATTRIBUTES;
 use clippy_utils::diagnostics::span_lint_and_then;
 use rustc_ast::{Attribute,MetaItem};
 use rustc_data_structures::fx::FxHashMap;
-use rustc_lint::LateContext;
+use rustc_lint::EarlyContext;
 use rustc_span::{Span, sym};
 use std::collections::hash_map::Entry;
 
 fnemit_if_duplicated(
-cx:&LateContext<'_>,
+cx:&EarlyContext<'_>,
 attr:&MetaItem,
 attr_paths:&mutFxHashMap<String,Span>,
 complete_path:String,
@@ -26,7 +26,7 @@ fn emit_if_duplicated(
 }
 
 fncheck_duplicated_attr(
-cx:&LateContext<'_>,
+cx:&EarlyContext<'_>,
 attr:&MetaItem,
 attr_paths:&mutFxHashMap<String,Span>,
 parent:&mutVec<String>,
@@ -65,7 +65,7 @@ fn check_duplicated_attr(
 }
 }
 
-pubfncheck(cx:&LateContext<'_>,attrs:&[Attribute]){
+pubfncheck(cx:&EarlyContext<'_>,attrs:&[Attribute]){
 letmut attr_paths = FxHashMap::default();
 
 for attr in attrs {

clippy_lints/src/attrs/mixed_attributes_style.rs

@@ -3,7 +3,7 @@ use clippy_utils::diagnostics::span_lint;
 use rustc_ast::{AttrKind,AttrStyle,Attribute};
 use rustc_data_structures::fx::FxHashSet;
 use rustc_data_structures::sync::Lrc;
-use rustc_lint::{LateContext,LintContext};
+use rustc_lint::{EarlyContext,LintContext};
 use rustc_span::source_map::SourceMap;
 use rustc_span::{SourceFile,Span,Symbol};
 
@@ -32,7 +32,7 @@ impl From<&AttrKind> for SimpleAttrKind {
 }
 }
 
-pub(super)fncheck(cx:&LateContext<'_>,item_span:Span,attrs:&[Attribute]){
+pub(super)fncheck(cx:&EarlyContext<'_>,item_span:Span,attrs:&[Attribute]){
 letmut inner_attr_kind:FxHashSet<SimpleAttrKind> = FxHashSet::default();
 letmut outer_attr_kind:FxHashSet<SimpleAttrKind> = FxHashSet::default();
 
@@ -64,7 +64,7 @@ pub(super) fn check(cx: &LateContext<'_>, item_span: Span, attrs: &[Attribute])
 }
 }
 
-fnlint_mixed_attrs(cx:&LateContext<'_>,attrs:&[Attribute]){
+fnlint_mixed_attrs(cx:&EarlyContext<'_>,attrs:&[Attribute]){
 letmut attrs_iter = attrs.iter().filter(|attr| !attr.span.from_expansion());
 let span = iflet(Some(first),Some(last)) = (attrs_iter.next(), attrs_iter.last()){
  first.span.with_hi(last.span.hi())

clippy_lints/src/attrs/mod.rs

@@ -14,8 +14,8 @@ mod utils;
 
 use clippy_config::Conf;
 use clippy_config::msrvs::{self,Msrv};
-use rustc_ast::{Attribute,MetaItemInner,MetaItemKind};
-use rustc_hir::{ImplItem,Item,ItemKind,TraitItem};
+use rustc_ast::{Attribute,MetaItemInner,MetaItemKind,selfas ast};
+use rustc_hir::{ImplItem,Item,TraitItem};
 use rustc_lint::{EarlyContext,EarlyLintPass,LateContext,LateLintPass};
 use rustc_session::impl_lint_pass;
 use rustc_span::sym;
@@ -414,15 +414,7 @@ pub struct Attributes {
 }
 
 impl_lint_pass!(Attributes => [
-ALLOW_ATTRIBUTES,
-ALLOW_ATTRIBUTES_WITHOUT_REASON,
 INLINE_ALWAYS,
-DEPRECATED_SEMVER,
-USELESS_ATTRIBUTE,
-BLANKET_CLIPPY_RESTRICTION_LINTS,
-SHOULD_PANIC_WITHOUT_EXPECT,
-MIXED_ATTRIBUTES_STYLE,
-DUPLICATED_ATTRIBUTES,
 ]);
 
 implAttributes{
@@ -434,53 +426,11 @@ impl Attributes {
 }
 
 impl<'tcx>LateLintPass<'tcx>forAttributes{
-fncheck_crate(&mutself,cx:&LateContext<'tcx>){
- blanket_clippy_restriction_lints::check_command_line(cx);
- duplicated_attributes::check(cx, cx.tcx.hir().krate_attrs());
-}
-
-fncheck_attribute(&mutself,cx:&LateContext<'tcx>,attr:&'tcxAttribute){
-ifletSome(items) = &attr.meta_item_list(){
-ifletSome(ident) = attr.ident(){
-ifis_lint_level(ident.name, attr.id){
- blanket_clippy_restriction_lints::check(cx, ident.name, items);
-}
-ifmatches!(ident.name, sym::allow) && self.msrv.meets(msrvs::LINT_REASONS_STABILIZATION){
- allow_attributes::check(cx, attr);
-}
-ifmatches!(ident.name, sym::allow | sym::expect) && self.msrv.meets(msrvs::LINT_REASONS_STABILIZATION)
-{
- allow_attributes_without_reason::check(cx, ident.name, items, attr);
-}
-if items.is_empty() || !attr.has_name(sym::deprecated){
-return;
-}
-for item in items {
-ifletMetaItemInner::MetaItem(mi) = &item
- && letMetaItemKind::NameValue(lit) = &mi.kind
- && mi.has_name(sym::since)
-{
- deprecated_semver::check(cx, item.span(), lit);
-}
-}
-}
-}
-if attr.has_name(sym::should_panic){
- should_panic_without_expect::check(cx, attr);
-}
-}
-
 fncheck_item(&mutself,cx:&LateContext<'tcx>,item:&'tcxItem<'_>){
 let attrs = cx.tcx.hir().attrs(item.hir_id());
 ifis_relevant_item(cx, item){
  inline_always::check(cx, item.span, item.ident.name, attrs);
 }
-match item.kind{
-ItemKind::ExternCrate(..) | ItemKind::Use(..) => useless_attribute::check(cx, item, attrs),
- _ => {},
-}
- mixed_attributes_style::check(cx, item.span, attrs);
- duplicated_attributes::check(cx, attrs);
 }
 
 fncheck_impl_item(&mutself,cx:&LateContext<'tcx>,item:&'tcxImplItem<'_>){
@@ -526,3 +476,77 @@ impl EarlyLintPass for EarlyAttributes {
 
 extract_msrv_attr!(EarlyContext);
 }
+
+pubstructPostExpansionEarlyAttributes{
+msrv:Msrv,
+}
+
+implPostExpansionEarlyAttributes{
+pubfnnew(conf:&'staticConf) -> Self{
+Self{
+msrv: conf.msrv.clone(),
+}
+}
+}
+
+impl_lint_pass!(PostExpansionEarlyAttributes => [
+ALLOW_ATTRIBUTES,
+ALLOW_ATTRIBUTES_WITHOUT_REASON,
+DEPRECATED_SEMVER,
+USELESS_ATTRIBUTE,
+BLANKET_CLIPPY_RESTRICTION_LINTS,
+SHOULD_PANIC_WITHOUT_EXPECT,
+MIXED_ATTRIBUTES_STYLE,
+DUPLICATED_ATTRIBUTES,
+]);
+
+implEarlyLintPassforPostExpansionEarlyAttributes{
+fncheck_crate(&mutself,cx:&EarlyContext<'_>,krate:&ast::Crate){
+ blanket_clippy_restriction_lints::check_command_line(cx);
+ duplicated_attributes::check(cx,&krate.attrs);
+}
+
+fncheck_attribute(&mutself,cx:&EarlyContext<'_>,attr:&Attribute){
+ifletSome(items) = &attr.meta_item_list(){
+ifletSome(ident) = attr.ident(){
+ifmatches!(ident.name, sym::allow) && self.msrv.meets(msrvs::LINT_REASONS_STABILIZATION){
+ allow_attributes::check(cx, attr);
+}
+ifmatches!(ident.name, sym::allow | sym::expect) && self.msrv.meets(msrvs::LINT_REASONS_STABILIZATION)
+{
+ allow_attributes_without_reason::check(cx, ident.name, items, attr);
+}
+ifis_lint_level(ident.name, attr.id){
+ blanket_clippy_restriction_lints::check(cx, ident.name, items);
+}
+if items.is_empty() || !attr.has_name(sym::deprecated){
+return;
+}
+for item in items {
+ifletMetaItemInner::MetaItem(mi) = &item
+ && letMetaItemKind::NameValue(lit) = &mi.kind
+ && mi.has_name(sym::since)
+{
+ deprecated_semver::check(cx, item.span(), lit);
+}
+}
+}
+}
+
+if attr.has_name(sym::should_panic){
+ should_panic_without_expect::check(cx, attr);
+}
+}
+
+fncheck_item(&mutself,cx:&EarlyContext<'_>,item:&'_ ast::Item){
+match item.kind{
+ ast::ItemKind::ExternCrate(..) | ast::ItemKind::Use(..) => useless_attribute::check(cx, item,&item.attrs),
+ _ => {},
+}
+
+ mixed_attributes_style::check(cx, item.span,&item.attrs);
+ duplicated_attributes::check(cx,&item.attrs);
+}
+
+extract_msrv_attr!(EarlyContext);
+}

clippy_lints/src/attrs/should_panic_without_expect.rs

@@ -4,12 +4,12 @@ use rustc_ast::token::{Token, TokenKind};
 use rustc_ast::tokenstream::TokenTree;
 use rustc_ast::{AttrArgs,AttrArgsEq,AttrKind};
 use rustc_errors::Applicability;
-use rustc_lint::LateContext;
+use rustc_lint::EarlyContext;
 use rustc_span::sym;
 
-pub(super)fncheck(cx:&LateContext<'_>,attr:&Attribute){
+pub(super)fncheck(cx:&EarlyContext<'_>,attr:&Attribute){
 ifletAttrKind::Normal(normal_attr) = &attr.kind{
-ifletAttrArgs::Eq(_,AttrArgsEq::Hir(_)) = &normal_attr.item.args{
+ifletAttrArgs::Eq(_,AttrArgsEq::Ast(_)) = &normal_attr.item.args{
 // `#[should_panic = ".."]` found, good
 return;
 }

clippy_lints/src/attrs/useless_attribute.rs

@@ -1,15 +1,15 @@
 usesuper::utils::{extract_clippy_lint, is_lint_level, is_word};
-usesuper::{Attribute,USELESS_ATTRIBUTE};
+usesuper::USELESS_ATTRIBUTE;
 use clippy_utils::diagnostics::span_lint_and_then;
 use clippy_utils::source::{SpanRangeExt, first_line_of_span};
 use rustc_ast::MetaItemInner;
 use rustc_errors::Applicability;
-userustc_hir::{Item,ItemKind};
-use rustc_lint::{LateContext,LintContext};
+userustc_ast::{Item,ItemKind,Attribute};
+use rustc_lint::{EarlyContext,LintContext};
 use rustc_middle::lint::in_external_macro;
 use rustc_span::sym;
 
-pub(super)fncheck(cx:&LateContext<'_>,item:&Item<'_>,attrs:&[Attribute]){
+pub(super)fncheck(cx:&EarlyContext<'_>,item:&Item,attrs:&[Attribute]){
 let skip_unused_imports = attrs.iter().any(|attr| attr.has_name(sym::macro_use));
 
 for attr in attrs {

clippy_lints/src/lib.rs

@@ -412,6 +412,8 @@ use rustc_lint::{Lint, LintId};
 pubfnregister_pre_expansion_lints(store:&mut rustc_lint::LintStore,conf:&'staticConf){
 // NOTE: Do not add any more pre-expansion passes. These should be removed eventually.
  store.register_pre_expansion_pass(move || Box::new(attrs::EarlyAttributes::new(conf)));
+
+ store.register_early_pass(move || Box::new(attrs::PostExpansionEarlyAttributes::new(conf)));
 }
 
 #[derive(Default)]