From 2571cc8041e3ec76c08e5ec92ad3d8e4c5978ddf Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Thu, 25 Mar 2021 17:01:21 +0000 Subject: [PATCH] virtio-devices: Address Rust 1.51.0 clippy issue (vec_init_then_push) warning: calls to `push` immediately after creation --> virtio-devices/src/vhost_user/net.rs:291:13 | 291 | / let mut interrupt_list_sub: Vec<(Option, Queue)> = Vec::with_capacity(2); 292 | | interrupt_list_sub.push(vu_interrupt_list.remove(0)); 293 | | interrupt_list_sub.push(vu_interrupt_list.remove(0)); | |_________________________________________________________________^ help: consider using the `vec![]` macro: `let mut interrupt_list_sub: Vec<(Option, Queue)> = vec![..];` | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#vec_init_then_push Signed-off-by: Rob Bradford --- virtio-devices/src/net.rs | 8 ++------ virtio-devices/src/transport/pci_device.rs | 2 +- virtio-devices/src/vhost_user/blk.rs | 3 +-- virtio-devices/src/vhost_user/net.rs | 4 +--- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/virtio-devices/src/net.rs b/virtio-devices/src/net.rs index 3a97c9fd1..981ae8e30 100644 --- a/virtio-devices/src/net.rs +++ b/virtio-devices/src/net.rs @@ -449,15 +449,11 @@ impl VirtioDevice for Net { let tx = TxVirtio::new(); let rx_tap_listening = false; - let mut queue_pair = Vec::new(); - queue_pair.push(queues.remove(0)); - queue_pair.push(queues.remove(0)); + let mut queue_pair = vec![queues.remove(0), queues.remove(0)]; queue_pair[0].set_event_idx(event_idx); queue_pair[1].set_event_idx(event_idx); - let mut queue_evt_pair = Vec::new(); - queue_evt_pair.push(queue_evts.remove(0)); - queue_evt_pair.push(queue_evts.remove(0)); + let queue_evt_pair = vec![queue_evts.remove(0), queue_evts.remove(0)]; let kill_evt = self .common diff --git a/virtio-devices/src/transport/pci_device.rs b/virtio-devices/src/transport/pci_device.rs index 8b71003a5..c63e773eb 100644 --- a/virtio-devices/src/transport/pci_device.rs +++ b/virtio-devices/src/transport/pci_device.rs @@ -631,7 +631,7 @@ impl VirtioPciDevice { if offset < std::mem::size_of::() { let (_, right) = cap_slice.split_at_mut(offset); - right[..data_len].copy_from_slice(&data[..]); + right[..data_len].copy_from_slice(&data); None } else { // Safe since we know self.cap_pci_cfg_info.cap.cap.offset is 32bits long. diff --git a/virtio-devices/src/vhost_user/blk.rs b/virtio-devices/src/vhost_user/blk.rs index 36bd79cdd..71b19c666 100644 --- a/virtio-devices/src/vhost_user/blk.rs +++ b/virtio-devices/src/vhost_user/blk.rs @@ -231,8 +231,7 @@ impl VirtioDevice for Blk { let mut epoll_threads = Vec::new(); for i in 0..vu_interrupt_list.len() { - let mut interrupt_list_sub: Vec<(Option, Queue)> = Vec::with_capacity(1); - interrupt_list_sub.push(vu_interrupt_list.remove(0)); + let interrupt_list_sub = vec![vu_interrupt_list.remove(0)]; let kill_evt = self .common diff --git a/virtio-devices/src/vhost_user/net.rs b/virtio-devices/src/vhost_user/net.rs index b65570d1f..ea52084e6 100644 --- a/virtio-devices/src/vhost_user/net.rs +++ b/virtio-devices/src/vhost_user/net.rs @@ -288,9 +288,7 @@ impl VirtioDevice for Net { let mut epoll_threads = Vec::new(); for i in 0..vu_interrupt_list.len() / 2 { - let mut interrupt_list_sub: Vec<(Option, Queue)> = Vec::with_capacity(2); - interrupt_list_sub.push(vu_interrupt_list.remove(0)); - interrupt_list_sub.push(vu_interrupt_list.remove(0)); + let interrupt_list_sub = vec![vu_interrupt_list.remove(0), vu_interrupt_list.remove(0)]; let kill_evt = self .common