From 0f5e71f8f2d42e3eac3e855a83d53899d4da6eb3 Mon Sep 17 00:00:00 2001
From: nahuakang <kangnahua@gmail.com>
Date: Wed, 3 Feb 2021 09:39:35 +0100
Subject: [PATCH] Add additional check on if arg type has iter method

---
 clippy_lints/src/loops.rs | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/clippy_lints/src/loops.rs b/clippy_lints/src/loops.rs
index 23dce283f28c..5bfdc98bc6a5 100644
--- a/clippy_lints/src/loops.rs
+++ b/clippy_lints/src/loops.rs
@@ -2041,25 +2041,24 @@ fn check_manual_flatten<'tcx>(
                     &mut applicability,
                 );
                 // Determine if `arg` is by reference, an `Iterator`, or implicitly adjusted with `into_iter`
-                let hint = match arg.kind {
-                    ExprKind::AddrOf(_, _, arg_expr) => {
+                let arg_ty = cx.typeck_results().expr_ty(arg);
+                let hint = if arg_ty.is_ref() {
+                    if has_iter_method(cx, arg_ty).is_none() {
+                        return;
+                    } else if let ExprKind::AddrOf(_, _, arg_expr) = arg.kind {
                         format!("{}.iter().flatten()", snippet(cx, arg_expr.span, ".."))
-                    },
-                    ExprKind::MethodCall(_, _, _, _) | ExprKind::Path(QPath::Resolved(None, _)) => {
-                        // Determine if `arg` is `Iterator` or implicitly calls `into_iter`
-                        let arg_ty = cx.typeck_results().expr_ty(arg);
-                        if let Some(id) = get_trait_def_id(cx, &paths::ITERATOR) {
-                            let is_iterator = implements_trait(cx, arg_ty, id, &[]);
-                            if is_iterator {
-                                format!("{}.flatten()", arg_snippet)
-                            } else {
-                                format!("{}.into_iter().flatten()", arg_snippet)
-                            }
-                        } else {
-                            return
-                        }
-                    },
-                    _ => return,
+                    } else {
+                        return;
+                    }
+                } else if let Some(id) = get_trait_def_id(cx, &paths::ITERATOR) {
+                    let is_iterator = implements_trait(cx, arg_ty, id, &[]);
+                    if is_iterator {
+                        format!("{}.flatten()", arg_snippet)
+                    } else {
+                        format!("{}.into_iter().flatten()", arg_snippet)
+                    }
+                } else {
+                    return
                 };
 
                 span_lint_and_sugg(