Merge remote-tracking branch 'upstream/master' into rustup

2022-05-20 20:37:38 +02:00 · 2022-05-20 20:37:38 +02:00 · 4e6cf0036e
commit 4e6cf0036e
parent 01421e0cbd 6f26383f8e
241 changed files with 4457 additions and 1730 deletions
--- a/clippy_lints/src/same_name_method.rs
+++ b/clippy_lints/src/same_name_method.rs
@ -54,11 +54,11 @@ impl<'tcx> LateLintPass<'tcx> for SameNameMethod {
            if matches!(cx.tcx.def_kind(id.def_id), DefKind::Impl)
                && let item = cx.tcx.hir().item(id)
                && let ItemKind::Impl(Impl {
-                  items,
-                  of_trait,
-                  self_ty,
-                  ..
-                                      }) = &item.kind
+                    items,
+                    of_trait,
+                    self_ty,
+                    ..
+                }) = &item.kind
                && let TyKind::Path(QPath::Resolved(_, Path { res, .. })) = self_ty.kind
            {
                if !map.contains_key(res) {