From 3a3773fa3036fd549b017902455678717d011a0d Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Fri, 24 Nov 2023 17:57:13 +0100
Subject: [PATCH] Add test for `option_map_or_err_ok` lint
---
tests/ui/manual_ok_or.stderr | 11 ++++++++++-
tests/ui/option_map_or_err_ok.fixed | 7 +++++++
tests/ui/option_map_or_err_ok.rs | 7 +++++++
tests/ui/option_map_or_err_ok.stderr | 11 +++++++++++
4 files changed, 35 insertions(+), 1 deletion(-)
create mode 100644 tests/ui/option_map_or_err_ok.fixed
create mode 100644 tests/ui/option_map_or_err_ok.rs
create mode 100644 tests/ui/option_map_or_err_ok.stderr
diff --git a/tests/ui/manual_ok_or.stderr b/tests/ui/manual_ok_or.stderr
index ddb2cf261e4..b277d22e59b 100644
--- a/tests/ui/manual_ok_or.stderr
+++ b/tests/ui/manual_ok_or.stderr
@@ -13,6 +13,15 @@ error: this pattern reimplements `Option::ok_or`
LL | foo.map_or(Err("error"), Ok);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: replace with: `foo.ok_or("error")`
+error: called `map_or(Err(_), Ok)` on an `Option` value
+ --> $DIR/manual_ok_or.rs:14:5
+ |
+LL | foo.map_or(Err("error"), Ok);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try using `ok_or` instead: `foo.ok_or("error")`
+ |
+ = note: `-D clippy::option-map-or-err-ok` implied by `-D warnings`
+ = help: to override `-D warnings` add `#[allow(clippy::option_map_or_err_ok)]`
+
error: this pattern reimplements `Option::ok_or`
--> $DIR/manual_ok_or.rs:17:5
|
@@ -38,5 +47,5 @@ LL + "{}{}{}{}{}{}{}",
LL ~ "Alice", "Bob", "Sarah", "Marc", "Sandra", "Eric", "Jenifer"));
|
-error: aborting due to 4 previous errors
+error: aborting due to 5 previous errors
diff --git a/tests/ui/option_map_or_err_ok.fixed b/tests/ui/option_map_or_err_ok.fixed
new file mode 100644
index 00000000000..131f4b2093e
--- /dev/null
+++ b/tests/ui/option_map_or_err_ok.fixed
@@ -0,0 +1,7 @@
+#![warn(clippy::option_map_or_err_ok)]
+
+fn main() {
+ let x = Some("a");
+ let _ = x.ok_or("a");
+ //~^ ERROR: called `map_or(Err(_), Ok)` on an `Option` value
+}
diff --git a/tests/ui/option_map_or_err_ok.rs b/tests/ui/option_map_or_err_ok.rs
new file mode 100644
index 00000000000..0f07a592ae5
--- /dev/null
+++ b/tests/ui/option_map_or_err_ok.rs
@@ -0,0 +1,7 @@
+#![warn(clippy::option_map_or_err_ok)]
+
+fn main() {
+ let x = Some("a");
+ let _ = x.map_or(Err("a"), Ok);
+ //~^ ERROR: called `map_or(Err(_), Ok)` on an `Option` value
+}
diff --git a/tests/ui/option_map_or_err_ok.stderr b/tests/ui/option_map_or_err_ok.stderr
new file mode 100644
index 00000000000..8476881aef7
--- /dev/null
+++ b/tests/ui/option_map_or_err_ok.stderr
@@ -0,0 +1,11 @@
+error: called `map_or(Err(_), Ok)` on an `Option` value
+ --> $DIR/option_map_or_err_ok.rs:5:13
+ |
+LL | let _ = x.map_or(Err("a"), Ok);
+ | ^^^^^^^^^^^^^^^^^^^^^^ help: try using `ok_or` instead: `x.ok_or("a")`
+ |
+ = note: `-D clippy::option-map-or-err-ok` implied by `-D warnings`
+ = help: to override `-D warnings` add `#[allow(clippy::option_map_or_err_ok)]`
+
+error: aborting due to previous error
+