Skip to content

Commit 421cd45

Browse files
committed
wire: vec: Rework if-let-chain for toolchain 1.85
As currently tested by mctp-dev. Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>
1 parent cc02d18 commit 421cd45

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

src/wire/vec.rs

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,19 @@ where
4545
Ctx: Copy,
4646
Predicate: FnMut(usize, &T) -> bool,
4747
{
48-
if let Some(cap) = capacity
49-
&& cap > S
50-
{
51-
return Err(deku_error!(
52-
DekuError::InvalidParam,
53-
"Provided capacity is larger than vector capacity",
54-
"{} exceeds {}",
55-
cap,
56-
S
57-
));
48+
#[allow(clippy::collapsible_if)]
49+
if let Some(cap) = capacity {
50+
if cap > S {
51+
return Err(deku_error!(
52+
DekuError::InvalidParam,
53+
"Provided capacity is larger than vector capacity",
54+
"{} exceeds {}",
55+
cap,
56+
S
57+
));
58+
}
5859
}
60+
5961
if mem::size_of::<T>() == 0 {
6062
return Ok(WireVec::new());
6163
}

0 commit comments

Comments
 (0)