From f58950de86f36ac41a7eed134529c76e4da3a552 Mon Sep 17 00:00:00 2001
From: Quinn Sinclair <me@partiallytyped.dev>
Date: Fri, 26 Jan 2024 23:48:47 +0100
Subject: [PATCH] correct lint case

---
 .../needless_return_with_question_mark.fixed   | 18 ++++++++++++++++++
 tests/ui/needless_return_with_question_mark.rs | 17 +++++++++++++++++
 .../needless_return_with_question_mark.stderr  |  8 +++++++-
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/tests/ui/needless_return_with_question_mark.fixed b/tests/ui/needless_return_with_question_mark.fixed
index 8a97d8604a5..2b0a835bc7f 100644
--- a/tests/ui/needless_return_with_question_mark.fixed
+++ b/tests/ui/needless_return_with_question_mark.fixed
@@ -104,3 +104,21 @@ fn issue11982() {
         Ok(())
     }
 }
+
+fn issue11982_no_conversion() {
+    mod bar {
+        pub struct Error;
+        pub fn foo(_: bool) -> Result<(), Error> {
+            Ok(())
+        }
+    }
+
+    fn foo(ok: bool) -> Result<(), bar::Error> {
+        if !ok {
+            bar::foo(ok).map(|_| Ok::<(), bar::Error>(()))?;
+            //~^ ERROR: unneeded `return` statement with `?` operator
+        };
+        Ok(())
+    }
+
+}
diff --git a/tests/ui/needless_return_with_question_mark.rs b/tests/ui/needless_return_with_question_mark.rs
index be15b000f5d..ecbf00254f0 100644
--- a/tests/ui/needless_return_with_question_mark.rs
+++ b/tests/ui/needless_return_with_question_mark.rs
@@ -104,3 +104,20 @@ fn issue11982() {
         Ok(())
     }
 }
+
+fn issue11982_no_conversion() {
+    mod bar {
+        pub struct Error;
+        pub fn foo(_: bool) -> Result<(), Error> {
+            Ok(())
+        }
+    }
+
+    fn foo(ok: bool) -> Result<(), bar::Error> {
+        if !ok {
+            return bar::foo(ok).map(|_| Ok::<(), bar::Error>(()))?;
+            //~^ ERROR: unneeded `return` statement with `?` operator
+        };
+        Ok(())
+    }
+}
diff --git a/tests/ui/needless_return_with_question_mark.stderr b/tests/ui/needless_return_with_question_mark.stderr
index 17aa212ae8d..59c212bcbb3 100644
--- a/tests/ui/needless_return_with_question_mark.stderr
+++ b/tests/ui/needless_return_with_question_mark.stderr
@@ -13,5 +13,11 @@ error: unneeded `return` statement with `?` operator
 LL |         return Err(())?;
    |         ^^^^^^^ help: remove it
 
-error: aborting due to 2 previous errors
+error: unneeded `return` statement with `?` operator
+  --> $DIR/needless_return_with_question_mark.rs:118:13
+   |
+LL |             return bar::foo(ok).map(|_| Ok::<(), bar::Error>(()))?;
+   |             ^^^^^^^ help: remove it
+
+error: aborting due to 3 previous errors