From d4196d029314c494d84aed97043b2eb84ecdea5b Mon Sep 17 00:00:00 2001
From: dswij <dswijj@gmail.com>
Date: Fri, 22 Oct 2021 13:36:13 +0800
Subject: [PATCH] Add #7859 FP test case for `question_mark`

---
 tests/ui/question_mark.rs | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/tests/ui/question_mark.rs b/tests/ui/question_mark.rs
index ca3722371f5..fc68a42e46f 100644
--- a/tests/ui/question_mark.rs
+++ b/tests/ui/question_mark.rs
@@ -2,6 +2,9 @@
 #![allow(unreachable_code)]
 #![allow(clippy::unnecessary_wraps)]
 
+use std::env;
+use std::path::PathBuf;
+
 fn some_func(a: Option<u32>) -> Option<u32> {
     if a.is_none() {
         return None;
@@ -134,7 +137,11 @@ fn f() -> Option<String> {
     Some(0)
 }
 
-fn result_func(x: Result<i32, &str>) -> Result<i32, &str> {
+fn func_returning_result() -> Result<i32, String> {
+    Ok(1)
+}
+
+fn result_func(x: Result<i32, String>) -> Result<i32, String> {
     let _ = if let Ok(x) = x { x } else { return x };
 
     if x.is_err() {
@@ -145,9 +152,21 @@ fn result_func(x: Result<i32, &str>) -> Result<i32, &str> {
     let y = if let Ok(x) = x {
         x
     } else {
-        return Err("some error");
+        return Err("some error".to_string());
     };
 
+    // issue #7859
+    // no warning
+    let _ = if let Ok(x) = func_returning_result() {
+        x
+    } else {
+        return Err("some error".to_string());
+    };
+
+    if func_returning_result().is_err() {
+        return func_returning_result();
+    }
+
     Ok(y)
 }