diff options
author | Nora Widdecke <nora@sequoia-pgp.org> | 2021-04-06 19:58:21 +0200 |
---|---|---|
committer | Nora Widdecke <nora@sequoia-pgp.org> | 2021-04-09 13:13:58 +0200 |
commit | 9424cd350f32a97479a74d919c646f9e26c2ebce (patch) | |
tree | e7b62ae2693ccbcb73d74cacabbf6c9a31a4552e /store | |
parent | ec5129c0863962dd3ee32b6af29be45d4d979193 (diff) |
Lint: Use lazy evaluation.
- https://rust-lang.github.io/rust-clippy/master/index.html#or_fun_call
Diffstat (limited to 'store')
-rw-r--r-- | store/src/backend/mod.rs | 6 | ||||
-rw-r--r-- | store/src/lib.rs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/store/src/backend/mod.rs b/store/src/backend/mod.rs index 2da08201..cbfe1f90 100644 --- a/store/src/backend/mod.rs +++ b/store/src/backend/mod.rs @@ -915,7 +915,7 @@ impl KeyServer { let next = Self::need_update(&c, network_policy) .map(|c| refresh_interval() / c) - .unwrap_or(min_sleep_time()); + .unwrap_or_else(|_| min_sleep_time()); if let Err(e) = cert.map(|t| key.merge(t)) { key.error("Update unsuccessful", @@ -939,7 +939,7 @@ impl KeyServer { loop { let duration = Self::update(&c, net::Policy::Encrypted).await; - let duration = duration.unwrap_or(min_sleep_time()); + let duration = duration.unwrap_or_else(|_| min_sleep_time()); tokio::time::delay_for(random_duration(duration)).await; } } @@ -990,7 +990,7 @@ impl node::key::Server for KeyServer { self.c.query_row( "SELECT key FROM keys WHERE id = ?1", &[&self.id], - |row| Ok(row.get(0).unwrap_or(vec![])))); + |row| Ok(row.get(0).unwrap_or_default()))); pry!(pry!(results.get().get_result()).set_ok(key.as_slice())); Promise::ok(()) } diff --git a/store/src/lib.rs b/store/src/lib.rs index ce437669..7c6041d9 100644 --- a/store/src/lib.rs +++ b/store/src/lib.rs @@ -1139,7 +1139,7 @@ impl Iterator for LogIter { r.get_error().ok() } else { None - }).ok_or(Error::StoreError.into())) + }).ok_or_else(|| Error::StoreError.into())) }; doit().ok() } |