diff options
author | David Sherret <dsherret@users.noreply.github.com> | 2023-03-15 17:46:36 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-15 17:46:36 -0400 |
commit | fb021d7ceff3f8b1d7cdb0c2bdd75ea07c0428d2 (patch) | |
tree | 09cb2bf87bba760b1abf706e0b8faedc9c368bbc /cli/http_util.rs | |
parent | ca51f4f6c058d16ac438ad75ac92e8954895f5aa (diff) |
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<T>` and that clippy
should suggest rewriting to
`map(...).unwrap_or(...)`/`map(...).unwrap_or_else(|| ...)`
https://github.com/rust-lang/rfcs/issues/1025
Diffstat (limited to 'cli/http_util.rs')
-rw-r--r-- | cli/http_util.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cli/http_util.rs b/cli/http_util.rs index 9476d6a5f..b01732ca9 100644 --- a/cli/http_util.rs +++ b/cli/http_util.rs @@ -202,7 +202,8 @@ impl CacheSemantics { && self .cache_control .max_stale - .map_or(true, |val| val > self.age() - self.max_age()); + .map(|val| val > self.age() - self.max_age()) + .unwrap_or(true); if !allows_stale { return false; } |