From fb021d7ceff3f8b1d7cdb0c2bdd75ea07c0428d2 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Wed, 15 Mar 2023 17:46:36 -0400 Subject: refactor: remove usages of `map_or` / `map_or_else` (#18212) These methods are confusing because the arguments are backwards. I feel like they should have never been added to `Option` and that clippy should suggest rewriting to `map(...).unwrap_or(...)`/`map(...).unwrap_or_else(|| ...)` https://github.com/rust-lang/rfcs/issues/1025 --- cli/bench/http.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cli/bench') diff --git a/cli/bench/http.rs b/cli/bench/http.rs index 06a177386..065d6f657 100644 --- a/cli/bench/http.rs +++ b/cli/bench/http.rs @@ -174,7 +174,7 @@ fn run( println!("{output}"); assert!( - server.try_wait()?.map_or(true, |s| s.success()), + server.try_wait()?.map(|s| s.success()).unwrap_or(true), "server ended with error" ); -- cgit v1.2.3