misc: Further improve imports styling

By introducing `imports_granularity="Module"` format strategy,
effectively groups imports from the same module into one line or block,
improving maintainability and readability.

Signed-off-by: Ruoqing He <heruoqing@iscas.ac.cn>

virtio-devices/src/vsock/csm/connection.rs

@@ -88,9 +88,8 @@ use std::time::{Duration, Instant};
 use super::super::defs::uapi;
 use super::super::packet::VsockPacket;
 use super::super::{Result as VsockResult, VsockChannel, VsockEpollListener, VsockError};
-use super::defs;
 use super::txbuf::TxBuf;
-use super::{ConnState, Error, PendingRx, PendingRxSet, Result};
+use super::{defs, ConnState, Error, PendingRx, PendingRxSet, Result};
 
 /// A self-managing connection object, that handles communication between a guest-side AF_VSOCK
 /// socket and a host-side `Read + Write + AsRawFd` stream.

virtio-devices/src/vsock/csm/txbuf.rs

@@ -5,8 +5,7 @@
 use std::io::Write;
 use std::num::Wrapping;
 
-use super::defs;
-use super::{Error, Result};
+use super::{defs, Error, Result};
 
 /// A simple ring-buffer implementation, used by vsock connections to buffer TX (guest -> host)
 /// data.  Memory for this buffer is allocated lazily, since buffering will only be needed when
@@ -144,9 +143,7 @@ impl TxBuf {
 
 #[cfg(test)]
 mod tests {
-    use std::io::Error as IoError;
-    use std::io::ErrorKind;
-    use std::io::Result as IoResult;
+    use std::io::{Error as IoError, ErrorKind, Result as IoResult};
 
     use super::*;
 

virtio-devices/src/vsock/device.rs

@@ -8,22 +8,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the THIRD-PARTY file.
 
-use std::io;
 use std::os::unix::io::AsRawFd;
 use std::path::PathBuf;
-use std::result;
 use std::sync::atomic::AtomicBool;
 use std::sync::{Arc, Barrier, RwLock};
+use std::{io, result};
 
 use anyhow::anyhow;
 use byteorder::{ByteOrder, LittleEndian};
 use seccompiler::SeccompAction;
 use serde::{Deserialize, Serialize};
-use virtio_queue::Queue;
-use virtio_queue::QueueOwnedT;
-use virtio_queue::QueueT;
-use vm_memory::GuestAddressSpace;
-use vm_memory::GuestMemoryAtomic;
+use virtio_queue::{Queue, QueueOwnedT, QueueT};
+use vm_memory::{GuestAddressSpace, GuestMemoryAtomic};
 use vm_migration::{Migratable, MigratableError, Pausable, Snapshot, Snapshottable, Transportable};
 use vm_virtio::AccessPlatform;
 use vmm_sys_util::eventfd::EventFd;
@@ -49,13 +45,12 @@ use vmm_sys_util::eventfd::EventFd;
 ///
 use super::{VsockBackend, VsockPacket};
 use crate::seccomp_filters::Thread;
-use crate::Error as DeviceError;
-use crate::GuestMemoryMmap;
-use crate::VirtioInterrupt;
+use crate::thread_helper::spawn_virtio_thread;
 use crate::{
-    thread_helper::spawn_virtio_thread, ActivateResult, EpollHelper, EpollHelperError,
-    EpollHelperHandler, VirtioCommon, VirtioDevice, VirtioDeviceType, VirtioInterruptType,
-    EPOLL_HELPER_EVENT_LAST, VIRTIO_F_IN_ORDER, VIRTIO_F_IOMMU_PLATFORM, VIRTIO_F_VERSION_1,
+    ActivateResult, EpollHelper, EpollHelperError, EpollHelperHandler, Error as DeviceError,
+    GuestMemoryMmap, VirtioCommon, VirtioDevice, VirtioDeviceType, VirtioInterrupt,
+    VirtioInterruptType, EPOLL_HELPER_EVENT_LAST, VIRTIO_F_IN_ORDER, VIRTIO_F_IOMMU_PLATFORM,
+    VIRTIO_F_VERSION_1,
 };
 
 const QUEUE_SIZE: u16 = 256;

virtio-devices/src/vsock/mod.rs

@@ -18,8 +18,7 @@ use std::os::unix::io::RawFd;
 use packet::VsockPacket;
 
 pub use self::device::Vsock;
-pub use self::unix::VsockUnixBackend;
-pub use self::unix::VsockUnixError;
+pub use self::unix::{VsockUnixBackend, VsockUnixError};
 
 mod defs {
 
@@ -178,8 +177,7 @@ mod tests {
     use super::*;
     use crate::device::{VirtioInterrupt, VirtioInterruptType};
     use crate::epoll_helper::EpollHelperHandler;
-    use crate::EpollHelper;
-    use crate::GuestMemoryMmap;
+    use crate::{EpollHelper, GuestMemoryMmap};
 
     pub struct NoopVirtioInterrupt {}
 

virtio-devices/src/vsock/packet.rs

@@ -24,8 +24,7 @@ use virtio_queue::DescriptorChain;
 use vm_memory::{Address, GuestMemory};
 use vm_virtio::{AccessPlatform, Translatable};
 
-use super::defs;
-use super::{Result, VsockError};
+use super::{defs, Result, VsockError};
 use crate::get_host_address_range;
 
 // The vsock packet header is defined by the C struct:

virtio-devices/src/vsock/unix/muxer.rs

@@ -50,11 +50,9 @@ use super::super::packet::VsockPacket;
 use super::super::{
     Result as VsockResult, VsockBackend, VsockChannel, VsockEpollListener, VsockError,
 };
-use super::defs;
 use super::muxer_killq::MuxerKillQ;
 use super::muxer_rxq::MuxerRxQ;
-use super::MuxerConnection;
-use super::{Error, Result};
+use super::{defs, Error, MuxerConnection, Result};
 
 /// A unique identifier of a `MuxerConnection` object. Connections are stored in a hash map,
 /// keyed by a `ConnMapKey` object.

virtio-devices/src/vsock/unix/muxer_killq.rs

@@ -28,9 +28,8 @@
 use std::collections::{HashMap, VecDeque};
 use std::time::Instant;
 
-use super::defs;
 use super::muxer::ConnMapKey;
-use super::MuxerConnection;
+use super::{defs, MuxerConnection};
 
 /// A kill queue item, holding the connection key and the scheduled time for termination.
 ///

virtio-devices/src/vsock/unix/muxer_rxq.rs

@@ -19,9 +19,8 @@
 use std::collections::{HashMap, VecDeque};
 
 use super::super::VsockChannel;
-use super::defs;
 use super::muxer::{ConnMapKey, MuxerRx};
-use super::MuxerConnection;
+use super::{defs, MuxerConnection};
 
 /// The muxer RX queue.
 ///