fix(multiple_inherent_impl): Criterion not needed in the value

Author: paulmialane

book/src/lint_configuration.md

@@ -672,7 +672,7 @@ A list of paths to types that should be treated as if they do not contain interi
 
 
 ## `inherent-impl-lint-scope`
-Sets the scope at which duplicate impl blocks for the same type are linted.
+Sets the scope ("crate", "file", or "module") in which duplicate inherent `impl` blocks for the same type are linted.
 
 **Default Value:** `"crate"`
 

clippy_config/src/conf.rs

@@ -663,7 +663,7 @@ define_Conf! {
     /// A list of paths to types that should be treated as if they do not contain interior mutability
     #[lints(borrow_interior_mutable_const, declare_interior_mutable_const, ifs_same_cond, mutable_key_type)]
     ignore_interior_mutability: Vec<String> = Vec::from(["bytes::Bytes".into()]),
-    /// Sets the scope at which duplicate impl blocks for the same type are linted.
+    /// Sets the scope ("crate", "file", or "module") in which duplicate inherent `impl` blocks for the same type are linted.
     #[lints(multiple_inherent_impl)]
     inherent_impl_lint_scope: InherentImplLintScope = InherentImplLintScope::Crate,
     /// The maximum size of the `Err`-variant in a `Result` returned from a function

clippy_lints/src/inherent_impl.rs

@@ -14,7 +14,7 @@ declare_clippy_lint! {
     /// ### What it does
     /// Checks for multiple inherent implementations of a struct
     ///
-    /// The config option controls the scope at which multiple inherent impl blocks for the same
+    /// The config option controls the scope in which multiple inherent `impl` blocks for the same
     /// struct are linted, allowing values of `module` (only within the same module), `file`
     /// (within the same file), or `crate` (anywhere in the crate, default).
     ///
@@ -103,31 +103,31 @@ impl<'tcx> LateLintPass<'tcx> for MultipleInherentImpl {
                         {
                             Criterion::File(cx.tcx.sess.source_map().lookup_source_file(span.lo()).name.clone())
                         } else {
-                            // We know we are working on an Impl, so the the pattern matching can
+                            // We know we are working on an impl, so the pattern matching can
                             // not fail
                             unreachable!()
                         }
                     },
                     InherentImplLintScope::Crate => Criterion::Crate,
                 };
-                match type_map.entry((impl_ty, criterion.clone())) {
+                match type_map.entry((impl_ty, criterion)) {
                     Entry::Vacant(e) => {
                         // Store the id for the first impl block of this type. The span is retrieved lazily.
-                        e.insert((IdOrSpan::Id(impl_id), criterion.clone()));
+                        e.insert(IdOrSpan::Id(impl_id));
                     },
                     Entry::Occupied(mut e) => {
                         if let Some(span) = get_impl_span(cx, impl_id) {
-                            let first_span = match e.get().0 {
+                            let first_span = match *e.get() {
                                 IdOrSpan::Span(s) => s,
                                 IdOrSpan::Id(id) => {
                                     if let Some(s) = get_impl_span(cx, id) {
                                         // Remember the span of the first block.
-                                        *e.get_mut() = (IdOrSpan::Span(s), criterion.clone());
+                                        *e.get_mut() = IdOrSpan::Span(s);
                                         s
                                     } else {
                                         // The first impl block isn't considered by the lint. Replace it with the
                                         // current one.
-                                        *e.get_mut() = (IdOrSpan::Span(span), criterion.clone());
+                                        *e.get_mut() = IdOrSpan::Span(span);
                                         continue;
                                     }
                                 },