Skip to content

Commit 53f5a09

Browse files
committed
chore: fix clippy
1 parent d84fbbf commit 53f5a09

2 files changed

Lines changed: 16 additions & 10 deletions

File tree

src/kernel/linux/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ impl Kernel for Linux {
5959
.collect::<Result<Vec<_>, _>>()?;
6060
let rules = (0..total).map(move |i| {
6161
(base.iter())
62-
.flat_map(|(x, v)| x[(x.len() == 1).then_some(0).unwrap_or_else(|| i / v % x.len())].iter())
62+
.flat_map(|(x, v)| x[if x.len() == 1 { 0 } else { i / v % x.len() }].iter())
6363
.cloned()
6464
.collect::<Vec<_>>()
6565
});

src/kernel/linux/nft.rs

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,11 @@ impl Component {
229229
)]]
230230
}
231231
PacketLen(ops) => {
232-
let ops = (afi == Afi::Ipv4)
233-
.then(|| Cow::Borrowed(ops))
234-
.unwrap_or_else(|| Cow::Owned(ops.with_offset(-40)));
232+
let ops = if afi == Afi::Ipv4 {
233+
Cow::Borrowed(ops)
234+
} else {
235+
Cow::Owned(ops.with_offset(-40))
236+
};
235237
range_stmt_branch(make_payload_field(ip_ver, "length"), &ops, 0xffff)?
236238
}
237239
Dscp(ops) => range_stmt_branch(make_payload_field(ip_ver, "dscp"), ops, 0x3f)?,
@@ -248,12 +250,16 @@ impl Component {
248250
let mut iter = new_set.into_iter().peekable();
249251
let mut branch = StatementBranch::new();
250252

251-
let frag_off = (afi == Afi::Ipv4)
252-
.then(|| make_payload_field("ip", "frag-off"))
253-
.unwrap_or_else(|| make_exthdr("frag", "frag-off", 0));
254-
let mf = (afi == Afi::Ipv4)
255-
.then(|| make_payload_raw(expr::PayloadBase::NH, 18, 1))
256-
.unwrap_or_else(|| make_exthdr("frag", "more-fragments", 0));
253+
let frag_off = if afi == Afi::Ipv4 {
254+
make_payload_field("ip", "frag-off")
255+
} else {
256+
make_exthdr("frag", "frag-off", 0)
257+
};
258+
let mf = if afi == Afi::Ipv4 {
259+
make_payload_raw(expr::PayloadBase::NH, 18, 1)
260+
} else {
261+
make_exthdr("frag", "more-fragments", 0)
262+
};
257263

258264
// DF (IPv4)
259265
if let Some(0b0001) = iter.peek() {

0 commit comments

Comments
 (0)