Skip to content

Commit 1ec036a

Browse files
stefano-garzarellaepilys
authored andcommitted
virtio-queue: fix clippy warnings on Rust 1.85
Our CI is being upgraded to Rust 1.85 and this will produce new warnings from clippy like this one: error: this `map_or` can be simplified --> virtio-queue/src/queue.rs:313:19 | 313 | } else if desc_table | ___________________^ 314 | | .checked_add(desc_table_size) 315 | | .map_or(true, |v| !mem.address_in_range(v)) | |_______________________________________________________^ | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_map_or = note: `-D clippy::unnecessary-map-or` implied by `-D warnings` = help: to override `-D warnings` add `#[allow(clippy::unnecessary_map_or)]` help: use is_none_or instead | 313 ~ } else if desc_table 314 + .checked_add(desc_table_size).is_none_or(|v| !mem.address_in_range(v)) Apply the advice using `cargo clippy --fix`. Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
1 parent d8d0362 commit 1ec036a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

virtio-queue/src/queue.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ impl QueueT for Queue {
312312
false
313313
} else if desc_table
314314
.checked_add(desc_table_size)
315-
.map_or(true, |v| !mem.address_in_range(v))
315+
.is_none_or(|v| !mem.address_in_range(v))
316316
{
317317
error!(
318318
"virtio queue descriptor table goes out of bounds: start:0x{:08x} size:0x{:08x}",
@@ -322,7 +322,7 @@ impl QueueT for Queue {
322322
false
323323
} else if avail_ring
324324
.checked_add(avail_ring_size)
325-
.map_or(true, |v| !mem.address_in_range(v))
325+
.is_none_or(|v| !mem.address_in_range(v))
326326
{
327327
error!(
328328
"virtio queue available ring goes out of bounds: start:0x{:08x} size:0x{:08x}",
@@ -332,7 +332,7 @@ impl QueueT for Queue {
332332
false
333333
} else if used_ring
334334
.checked_add(used_ring_size)
335-
.map_or(true, |v| !mem.address_in_range(v))
335+
.is_none_or(|v| !mem.address_in_range(v))
336336
{
337337
error!(
338338
"virtio queue used ring goes out of bounds: start:0x{:08x} size:0x{:08x}",

0 commit comments

Comments
 (0)