From 12474c62ff89ab122c2e6881b00680913fdf1d35 Mon Sep 17 00:00:00 2001
From: Hirochika Matsumoto <matsujika@gmail.com>
Date: Sun, 18 Oct 2020 16:53:18 +0900
Subject: [PATCH] Add support for methods

---
 clippy_lints/src/unnecessary_wrap.rs |  6 +++++-
 tests/ui/unnecessary_wrap.rs         | 14 ++++++++++++++
 tests/ui/unnecessary_wrap.stderr     | 19 ++++++++++++++++++-
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/clippy_lints/src/unnecessary_wrap.rs b/clippy_lints/src/unnecessary_wrap.rs
index a20d1f82e9ef..365e9c9984e8 100644
--- a/clippy_lints/src/unnecessary_wrap.rs
+++ b/clippy_lints/src/unnecessary_wrap.rs
@@ -64,7 +64,11 @@ impl<'tcx> LateLintPass<'tcx> for UnnecessaryWrap {
         hir_id: HirId,
     ) {
         match fn_kind {
-            FnKind::ItemFn(.., visibility, _) if visibility.node.is_pub() => return,
+            FnKind::ItemFn(.., visibility, _) | FnKind::Method(.., Some(visibility), _) => {
+                if visibility.node.is_pub() {
+                    return;
+                }
+            },
             FnKind::Closure(..) => return,
             _ => (),
         }
diff --git a/tests/ui/unnecessary_wrap.rs b/tests/ui/unnecessary_wrap.rs
index 6037f5807d3e..0ced20b7a566 100644
--- a/tests/ui/unnecessary_wrap.rs
+++ b/tests/ui/unnecessary_wrap.rs
@@ -76,6 +76,20 @@ fn func9(a: bool) -> Result<i32, ()> {
     Err(())
 }
 
+struct A;
+
+impl A {
+    // should not be linted
+    pub fn func10() -> Option<i32> {
+        Some(1)
+    }
+
+    // should be linted
+    fn func11() -> Option<i32> {
+        Some(1)
+    }
+}
+
 fn main() {
     // method calls are not linted
     func1(true, true);
diff --git a/tests/ui/unnecessary_wrap.stderr b/tests/ui/unnecessary_wrap.stderr
index 958bc9980225..dbc5748c29ec 100644
--- a/tests/ui/unnecessary_wrap.stderr
+++ b/tests/ui/unnecessary_wrap.stderr
@@ -85,5 +85,22 @@ help: ...and change the returning expressions
 LL |     1
    |
 
-error: aborting due to 4 previous errors
+error: this function's return value is unnecessarily wrapped by `Option`
+  --> $DIR/unnecessary_wrap.rs:88:5
+   |
+LL | /     fn func11() -> Option<i32> {
+LL | |         Some(1)
+LL | |     }
+   | |_____^
+   |
+help: remove `Option` from the return type...
+   |
+LL |     fn func11() -> i32 {
+   |                    ^^^
+help: ...and change the returning expressions
+   |
+LL |         1
+   |
+
+error: aborting due to 5 previous errors