Fix dogfood errors

Author: flip1995

clippy_lints/src/lib.rs

@@ -983,8 +983,8 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
     store.register_late_pass(move || box matches::Matches::new(msrv.clone()));
     let msrv = parsed_msrv.clone();
     store.register_early_pass(move || box manual_non_exhaustive::ManualNonExhaustive::new(msrv.clone()));
-    let msrv = parsed_msrv.clone();
-    store.register_late_pass(move || box manual_strip::ManualStrip::new(msrv.clone()));   
+    let msrv = parsed_msrv;
+    store.register_late_pass(move || box manual_strip::ManualStrip::new(msrv.clone()));
 
     store.register_late_pass(|| box map_clone::MapClone);
     store.register_late_pass(|| box map_err_ignore::MapErrIgnore);

clippy_lints/src/matches.rs

@@ -537,7 +537,7 @@ impl Matches {
     pub fn new(msrv: Option<VersionReq>) -> Self {
         Self {
             msrv,
-            ..Default::default()
+            ..Matches::default()
         }
     }
 }

clippy_lints/src/utils/attrs.rs

@@ -124,17 +124,20 @@ fn parse_attrs<F: FnMut(u64)>(sess: &Session, attrs: &[ast::Attribute], name: &'
     }
 }
 
-pub fn get_inner_attr(sess: &Session, attrs: &[ast::Attribute], name: &'static str) -> Option<ast::Attribute> {
+pub fn get_unique_inner_attr(sess: &Session, attrs: &[ast::Attribute], name: &'static str) -> Option<ast::Attribute> {
+    let mut unique_attr = None;
     for attr in get_attr(sess, attrs, name) {
         match attr.style {
-            ast::AttrStyle::Inner => return Some(attr.clone()),
+            ast::AttrStyle::Inner if unique_attr.is_none() => unique_attr = Some(attr.clone()),
+            ast::AttrStyle::Inner => {
+                sess.span_err(attr.span, &format!("`{}` is defined multiple times", name));
+            },
             ast::AttrStyle::Outer => {
                 sess.span_err(attr.span, &format!("`{}` cannot be an outer attribute", name));
-                return None;
             },
         }
     }
-    None
+    unique_attr
 }
 
 /// Return true if the attributes contain any of `proc_macro`,

clippy_lints/src/utils/mod.rs

@@ -72,7 +72,7 @@ pub fn parse_msrv(msrv: &str, sess: Option<&Session>, span: Option<Span>) -> Opt
             sess.span_err(span, &format!("`{}` is not a valid Rust version", msrv));
         }
     }
-    return None;
+    None
 }
 
 pub fn meets_msrv(msrv: Option<&VersionReq>, lint_msrv: &Version) -> bool {