Auto merge of #12646 - GuillaumeGomez:regression-test-12537, r=blyxyas

Turn `duplicated_attributes` into a late lint
Fixes#12537.
changelog: Turn `duplicated_attributes` into a late lint

Author: bors

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::EarlyContext;
+use rustc_lint::LateContext;
 use rustc_span::{sym,Span};
 use std::collections::hash_map::Entry;
 
 fnemit_if_duplicated(
-cx:&EarlyContext<'_>,
+cx:&LateContext<'_>,
 attr:&MetaItem,
 attr_paths:&mutFxHashMap<String,Span>,
 complete_path:String,
@@ -26,7 +26,7 @@ fn emit_if_duplicated(
 }
 
 fncheck_duplicated_attr(
-cx:&EarlyContext<'_>,
+cx:&LateContext<'_>,
 attr:&MetaItem,
 attr_paths:&mutFxHashMap<String,Span>,
 parent:&mutVec<String>,
@@ -64,7 +64,7 @@ fn check_duplicated_attr(
 }
 }
 
-pubfncheck(cx:&EarlyContext<'_>,attrs:&[Attribute]){
+pubfncheck(cx:&LateContext<'_>,attrs:&[Attribute]){
 letmut attr_paths = FxHashMap::default();
 
 for attr in attrs {

clippy_lints/src/attrs/mod.rs

@@ -17,7 +17,7 @@ mod useless_attribute;
 mod utils;
 
 use clippy_config::msrvs::Msrv;
-use rustc_ast::{Attribute,Crate,MetaItemKind,NestedMetaItem};
+use rustc_ast::{Attribute,MetaItemKind,NestedMetaItem};
 use rustc_hir::{ImplItem,Item,ItemKind,TraitItem};
 use rustc_lint::{EarlyContext,EarlyLintPass,LateContext,LateLintPass};
 use rustc_session::{declare_lint_pass, impl_lint_pass};
@@ -534,11 +534,13 @@ declare_lint_pass!(Attributes => [
 BLANKET_CLIPPY_RESTRICTION_LINTS,
 SHOULD_PANIC_WITHOUT_EXPECT,
 MIXED_ATTRIBUTES_STYLE,
+DUPLICATED_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){
@@ -578,6 +580,7 @@ impl<'tcx> LateLintPass<'tcx> for Attributes {
  _ => {},
 }
  mixed_attributes_style::check(cx, item.span, attrs);
+ duplicated_attributes::check(cx, attrs);
 }
 
 fncheck_impl_item(&mutself,cx:&LateContext<'tcx>,item:&'tcxImplItem<'_>){
@@ -606,17 +609,11 @@ impl_lint_pass!(EarlyAttributes => [
 MAYBE_MISUSED_CFG,
 DEPRECATED_CLIPPY_CFG_ATTR,
 UNNECESSARY_CLIPPY_CFG,
-DUPLICATED_ATTRIBUTES,
 ]);
 
 implEarlyLintPassforEarlyAttributes{
-fncheck_crate(&mutself,cx:&EarlyContext<'_>,krate:&Crate){
- duplicated_attributes::check(cx,&krate.attrs);
-}
-
 fncheck_item(&mutself,cx:&EarlyContext<'_>,item:&rustc_ast::Item){
  empty_line_after::check(cx, item);
- duplicated_attributes::check(cx,&item.attrs);
 }
 
 fncheck_attribute(&mutself,cx:&EarlyContext<'_>,attr:&Attribute){

tests/ui/auxiliary/proc_macro_attr.rs

@@ -176,3 +176,17 @@ pub fn with_empty_docs(_attr: TokenStream, input: TokenStream) -> TokenStream {
 }
 .into()
 }
+
+#[proc_macro_attribute]
+pubfnduplicated_attr(_attr:TokenStream,input:TokenStream) -> TokenStream{
+let item = parse_macro_input!(input as syn::Item);
+let attrs:Vec<syn::Attribute> = vec![];
+quote!{
+ #(#attrs)*
+ #[allow(unused)]
+ #[allow(unused)]
+ #[allow(unused)]
+ #item
+}
+.into()
+}

tests/ui/duplicated_attributes.rs

@@ -1,9 +1,14 @@
+//@aux-build:proc_macro_attr.rs
+
 #![warn(clippy::duplicated_attributes)]
 #![cfg(any(unix, windows))]
 #![allow(dead_code)]
 #![allow(dead_code)]//~ ERROR: duplicated attribute
 #![cfg(any(unix, windows))]// Should not warn!
 
+#[macro_use]
+externcrate proc_macro_attr;
+
 #[cfg(any(unix, windows, target_os = "linux"))]
 #[allow(dead_code)]
 #[allow(dead_code)]//~ ERROR: duplicated attribute
@@ -12,7 +17,10 @@ fn foo() {}
 
 #[cfg(unix)]
 #[cfg(windows)]
-#[cfg(unix)]//~ ERROR: duplicated attribute
+#[cfg(unix)]// cfgs are not handled
 fnbar(){}
 
+#[proc_macro_attr::duplicated_attr()]// Should not warn!
+fnbabar(){}
+
 fnmain(){}

tests/ui/duplicated_attributes.stderr

@@ -1,55 +1,38 @@
 error: duplicated attribute
- --> tests/ui/duplicated_attributes.rs:4:10
+ --> tests/ui/duplicated_attributes.rs:6:10
  |
 LL | #![allow(dead_code)]
  | ^^^^^^^^^
  |
 note: first defined here
- --> tests/ui/duplicated_attributes.rs:3:10
+ --> tests/ui/duplicated_attributes.rs:5:10
  |
 LL | #![allow(dead_code)]
  | ^^^^^^^^^
 help: remove this attribute
- --> tests/ui/duplicated_attributes.rs:4:10
+ --> tests/ui/duplicated_attributes.rs:6:10
  |
 LL | #![allow(dead_code)]
  | ^^^^^^^^^
  = note: `-D clippy::duplicated-attributes` implied by `-D warnings`
  = help: to override `-D warnings` add `#[allow(clippy::duplicated_attributes)]`
 
 error: duplicated attribute
- --> tests/ui/duplicated_attributes.rs:9:9
+ --> tests/ui/duplicated_attributes.rs:14:9
  |
 LL | #[allow(dead_code)]
  | ^^^^^^^^^
  |
 note: first defined here
- --> tests/ui/duplicated_attributes.rs:8:9
+ --> tests/ui/duplicated_attributes.rs:13:9
  |
 LL | #[allow(dead_code)]
  | ^^^^^^^^^
 help: remove this attribute
- --> tests/ui/duplicated_attributes.rs:9:9
+ --> tests/ui/duplicated_attributes.rs:14:9
  |
 LL | #[allow(dead_code)]
  | ^^^^^^^^^
 
-error: duplicated attribute
- --> tests/ui/duplicated_attributes.rs:15:7
- |
-LL | #[cfg(unix)]
- | ^^^^
- |
-note: first defined here
- --> tests/ui/duplicated_attributes.rs:13:7
- |
-LL | #[cfg(unix)]
- | ^^^^
-help: remove this attribute
- --> tests/ui/duplicated_attributes.rs:15:7
- |
-LL | #[cfg(unix)]
- | ^^^^
-
-error: aborting due to 3 previous errors
+error: aborting due to 2 previous errors
 

tests/ui/unnecessary_clippy_cfg.stderr

@@ -57,5 +57,41 @@ error: no need to put clippy lints behind a `clippy` cfg
 LL | #![cfg_attr(clippy, deny(clippy::non_minimal_cfg, clippy::maybe_misused_cfg))]
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: replace with: `#![deny(clippy::non_minimal_cfg, clippy::maybe_misused_cfg)]`
 
-error: aborting due to 8 previous errors
+error: duplicated attribute
+ --> tests/ui/unnecessary_clippy_cfg.rs:8:26
+ |
+LL | #![cfg_attr(clippy, deny(dead_code, clippy::non_minimal_cfg, clippy::maybe_misused_cfg))]
+ | ^^^^^^^^^
+ |
+note: first defined here
+ --> tests/ui/unnecessary_clippy_cfg.rs:6:26
+ |
+LL | #![cfg_attr(clippy, deny(dead_code, clippy::non_minimal_cfg))]
+ | ^^^^^^^^^
+help: remove this attribute
+ --> tests/ui/unnecessary_clippy_cfg.rs:8:26
+ |
+LL | #![cfg_attr(clippy, deny(dead_code, clippy::non_minimal_cfg, clippy::maybe_misused_cfg))]
+ | ^^^^^^^^^
+ = note: `-D clippy::duplicated-attributes` implied by `-D warnings`
+ = help: to override `-D warnings` add `#[allow(clippy::duplicated_attributes)]`
+
+error: duplicated attribute
+ --> tests/ui/unnecessary_clippy_cfg.rs:17:25
+ |
+LL | #[cfg_attr(clippy, deny(dead_code, clippy::non_minimal_cfg, clippy::maybe_misused_cfg))]
+ | ^^^^^^^^^
+ |
+note: first defined here
+ --> tests/ui/unnecessary_clippy_cfg.rs:15:25
+ |
+LL | #[cfg_attr(clippy, deny(dead_code, clippy::non_minimal_cfg))]
+ | ^^^^^^^^^
+help: remove this attribute
+ --> tests/ui/unnecessary_clippy_cfg.rs:17:25
+ |
+LL | #[cfg_attr(clippy, deny(dead_code, clippy::non_minimal_cfg, clippy::maybe_misused_cfg))]
+ | ^^^^^^^^^
+
+error: aborting due to 10 previous errors
 

tests/ui/useless_attribute.fixed

@@ -1,6 +1,6 @@
 //@aux-build:proc_macro_derive.rs
 
-#![allow(unused)]
+#![allow(unused, clippy::duplicated_attributes)]
 #![warn(clippy::useless_attribute)]
 #![warn(unreachable_pub)]
 #![feature(rustc_private)]

tests/ui/useless_attribute.rs

@@ -1,6 +1,6 @@
 //@aux-build:proc_macro_derive.rs
 
-#![allow(unused)]
+#![allow(unused, clippy::duplicated_attributes)]
 #![warn(clippy::useless_attribute)]
 #![warn(unreachable_pub)]
 #![feature(rustc_private)]