From: Nick Torres <nickrtorres@icloud.com>
Date: Sat, 4 Apr 2020 21:02:45 +0000 (-0700)
Subject: result_map_or_into_option: add `opt.map_or(None, |_| Some(y))` test
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=fb276dc3fa1d644ce6de1849ff3b78d3e54f5d9e;p=rust.git

result_map_or_into_option: add `opt.map_or(None, |_| Some(y))` test
---

diff --git a/tests/ui/result_map_or_into_option.fixed b/tests/ui/result_map_or_into_option.fixed
index 07daf19fa25..331531b5165 100644
--- a/tests/ui/result_map_or_into_option.fixed
+++ b/tests/ui/result_map_or_into_option.fixed
@@ -11,4 +11,9 @@ fn main() {
     // A non-Some `f` arg should not emit the lint
     let opt: Result<u32, &str> = Ok(1);
     let _ = opt.map_or(None, rewrap);
+
+    // A non-Some `f` closure where the argument is not used as the
+    // return should not emit the lint
+    let opt: Result<u32, &str> = Ok(1);
+    opt.map_or(None, |_x| Some(1));
 }
diff --git a/tests/ui/result_map_or_into_option.rs b/tests/ui/result_map_or_into_option.rs
index d097c19e44b..3058480e2ad 100644
--- a/tests/ui/result_map_or_into_option.rs
+++ b/tests/ui/result_map_or_into_option.rs
@@ -11,4 +11,9 @@ fn main() {
     // A non-Some `f` arg should not emit the lint
     let opt: Result<u32, &str> = Ok(1);
     let _ = opt.map_or(None, rewrap);
+
+    // A non-Some `f` closure where the argument is not used as the
+    // return should not emit the lint
+    let opt: Result<u32, &str> = Ok(1);
+    opt.map_or(None, |_x| Some(1));
 }