From 32285e1d92e0291baf8942a03b3a4bbe49aaf3c8 Mon Sep 17 00:00:00 2001 From: Andrew Jeffery Date: Fri, 22 Aug 2025 16:10:20 +0930 Subject: [PATCH] wire: vec: Rework if-let-chain for toolchain 1.85 As currently tested by mctp-dev. Signed-off-by: Andrew Jeffery --- src/wire/vec.rs | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/wire/vec.rs b/src/wire/vec.rs index bc066ac..dae2ec1 100644 --- a/src/wire/vec.rs +++ b/src/wire/vec.rs @@ -45,17 +45,19 @@ where Ctx: Copy, Predicate: FnMut(usize, &T) -> bool, { - if let Some(cap) = capacity - && cap > S - { - return Err(deku_error!( - DekuError::InvalidParam, - "Provided capacity is larger than vector capacity", - "{} exceeds {}", - cap, - S - )); + #[allow(clippy::collapsible_if)] + if let Some(cap) = capacity { + if cap > S { + return Err(deku_error!( + DekuError::InvalidParam, + "Provided capacity is larger than vector capacity", + "{} exceeds {}", + cap, + S + )); + } } + if mem::size_of::() == 0 { return Ok(WireVec::new()); }