[pbs-devel] [PATCH proxmox v2 01/18] use unwrap_or_default instead of unwrap_or(Vec::new)
Maximiliano Sandoval
m.sandoval at proxmox.com
Wed Jun 26 14:43:29 CEST 2024
Fixes the clippy warning:
warning: use of `unwrap_or_else` to construct default value
--> proxmox-tfa/src/api/mod.rs:1355:43
|
1355 | |cap| cap.map(Vec::with_capacity).unwrap_or_else(Vec::new),
| ^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `unwrap_or_default()`
|
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#unwrap_or_default
= note: `#[warn(clippy::unwrap_or_default)]` on by default
Signed-off-by: Maximiliano Sandoval <m.sandoval at proxmox.com>
---
Differences from v1:
- run rustfmt
- add missing negation from going to get().is_none() to contains_key()
proxmox-tfa/src/api/mod.rs | 2 +-
proxmox-tfa/src/api/serde_tools.rs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/proxmox-tfa/src/api/mod.rs b/proxmox-tfa/src/api/mod.rs
index f7aeea5a..16444f17 100644
--- a/proxmox-tfa/src/api/mod.rs
+++ b/proxmox-tfa/src/api/mod.rs
@@ -1352,7 +1352,7 @@ where
let expire_before = proxmox_time::epoch_i64() - CHALLENGE_TIMEOUT_SECS;
deserializer.deserialize_seq(serde_tools::fold(
"a challenge entry",
- |cap| cap.map(Vec::with_capacity).unwrap_or_else(Vec::new),
+ |cap| cap.map(Vec::with_capacity).unwrap_or_default(),
move |out, reg: T| {
if !reg.is_expired(expire_before) {
out.push(reg);
diff --git a/proxmox-tfa/src/api/serde_tools.rs b/proxmox-tfa/src/api/serde_tools.rs
index 8fbe0fc2..206128bd 100644
--- a/proxmox-tfa/src/api/serde_tools.rs
+++ b/proxmox-tfa/src/api/serde_tools.rs
@@ -83,7 +83,7 @@ where
/// {
/// deserializer.deserialize_seq(proxmox_serde::fold(
/// "a sequence of integers",
-/// |cap| cap.map(Vec::with_capacity).unwrap_or_else(Vec::new),
+/// |cap| cap.map(Vec::with_capacity).unwrap_or_default(),
/// |out, num: u64| {
/// if num != 4 {
/// out.push(num.to_string());
--
2.39.2
More information about the pbs-devel
mailing list