diff --git a/src/main.rs b/src/main.rs index ae9a62f40..1335d8207 100644 --- a/src/main.rs +++ b/src/main.rs @@ -799,7 +799,7 @@ mod unit_tests { #[test] fn test_valid_vm_config_cpus() { - vec![ + [ ( vec![ "cloud-hypervisor", @@ -917,7 +917,7 @@ mod unit_tests { #[test] fn test_valid_vm_config_kernel() { - vec![( + [( vec!["cloud-hypervisor", "--kernel", "/path/to/kernel"], r#"{ "payload": {"kernel": "/path/to/kernel"} @@ -932,7 +932,7 @@ mod unit_tests { #[test] fn test_valid_vm_config_cmdline() { - vec![( + [( vec![ "cloud-hypervisor", "--kernel", @@ -953,7 +953,7 @@ mod unit_tests { #[test] fn test_valid_vm_config_disks() { - vec![ + [ ( vec![ "cloud-hypervisor", @@ -1227,7 +1227,7 @@ mod unit_tests { #[test] fn test_valid_vm_config_rng() { - vec![( + [( vec![ "cloud-hypervisor", "--kernel", @@ -1249,8 +1249,7 @@ mod unit_tests { #[test] fn test_valid_vm_config_fs() { - vec![ - ( + [( vec![ "cloud-hypervisor", "--kernel", "/path/to/kernel", "--memory", "shared=true", @@ -1320,8 +1319,7 @@ mod unit_tests { ] }"#, true, - ), - ] + )] .iter() .for_each(|(cli, openapi, equal)| { compare_vm_config_cli_vs_json(cli, openapi, *equal); @@ -1330,7 +1328,7 @@ mod unit_tests { #[test] fn test_valid_vm_config_pmem() { - vec![ + [ ( vec![ "cloud-hypervisor", @@ -1394,7 +1392,7 @@ mod unit_tests { #[test] fn test_valid_vm_config_serial_console() { - vec![ + [ ( vec!["cloud-hypervisor", "--kernel", "/path/to/kernel"], r#"{ @@ -1445,7 +1443,7 @@ mod unit_tests { #[test] fn test_valid_vm_config_serial_pty_console_pty() { - vec![ + [ ( vec!["cloud-hypervisor", "--kernel", "/path/to/kernel"], r#"{ @@ -1593,7 +1591,7 @@ mod unit_tests { #[test] fn test_valid_vm_config_vdpa() { - vec![ + [ ( vec![ "cloud-hypervisor", @@ -1640,7 +1638,7 @@ mod unit_tests { #[test] fn test_valid_vm_config_vsock() { - vec![ + [ ( vec![ "cloud-hypervisor", @@ -1723,7 +1721,7 @@ mod unit_tests { #[test] fn test_valid_vm_config_tpm_socket() { - vec![( + [( vec![ "cloud-hypervisor", "--kernel", diff --git a/test_infra/src/lib.rs b/test_infra/src/lib.rs index 63a28a30b..6857d13b5 100644 --- a/test_infra/src/lib.rs +++ b/test_infra/src/lib.rs @@ -108,7 +108,7 @@ impl GuestNetworkConfig { epoll::Event::new(epoll::Events::EPOLLIN, 0), ) .expect("Cannot add 'tcp_listener' event to epoll"); - let mut events = vec![epoll::Event::new(epoll::Events::empty(), 0); 1]; + let mut events = [epoll::Event::new(epoll::Events::empty(), 0); 1]; loop { let num_events = match epoll::wait(epoll_fd, timeout * 1000_i32, &mut events[..]) { Ok(num_events) => Ok(num_events), @@ -252,7 +252,7 @@ impl DiskConfig for UbuntuDiskConfig { .join("ubuntu") .join("ci"); - vec!["meta-data"].iter().for_each(|x| { + ["meta-data"].iter().for_each(|x| { rate_limited_copy(source_file_dir.join(x), cloud_init_directory.join(x)) .expect("Expect copying cloud-init meta-data to succeed"); }); @@ -308,7 +308,7 @@ impl DiskConfig for UbuntuDiskConfig { .output() .expect("Expect creating disk image to succeed"); - vec!["user-data", "meta-data", "network-config"] + ["user-data", "meta-data", "network-config"] .iter() .for_each(|x| { std::process::Command::new("mcopy") diff --git a/virtio-devices/src/vsock/unix/muxer.rs b/virtio-devices/src/vsock/unix/muxer.rs index 2972d3a68..2eca46fc2 100644 --- a/virtio-devices/src/vsock/unix/muxer.rs +++ b/virtio-devices/src/vsock/unix/muxer.rs @@ -971,7 +971,7 @@ mod tests { self.init_pkt(local_port, peer_port, uapi::VSOCK_OP_RESPONSE); self.send(); - let mut buf = vec![0u8; 32]; + let mut buf = [0u8; 32]; let len = stream.read(&mut buf[..]).unwrap(); assert_eq!(&buf[..len], format!("OK {local_port}\n").as_bytes()); diff --git a/vmm/src/serial_manager.rs b/vmm/src/serial_manager.rs index 30170f90e..6922686b2 100644 --- a/vmm/src/serial_manager.rs +++ b/vmm/src/serial_manager.rs @@ -229,7 +229,7 @@ impl SerialManager { const EPOLL_EVENTS_LEN: usize = 3; let mut events = - vec![epoll::Event::new(epoll::Events::empty(), 0); EPOLL_EVENTS_LEN]; + [epoll::Event::new(epoll::Events::empty(), 0); EPOLL_EVENTS_LEN]; loop { let num_events = match epoll::wait(epoll_fd, timeout, &mut events[..]) {