spi: add and fix workspace lints

No functional changes.

Signed-off-by: Manos Pitsidianakis <[email protected]>

Author: epilys

vhost-device-spi/Cargo.toml

@@ -10,7 +10,8 @@ categories = ["virtualization"]
 license = "Apache-2.0 OR BSD-3-Clause"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lints]
+workspace = true
 
 [features]
 xen = ["vm-memory/xen", "vhost/xen", "vhost-user-backend/xen"]

vhost-device-spi/src/linux_spi.rs

@@ -53,11 +53,12 @@ ioctl_iow_nr!(SPI_IOC_WR_MODE32, 107, 5, u32);
 
 // Corresponds to the SPI_IOC_MESSAGE macro in Linux
 pub fn spi_ioc_message(n: u32) -> u64 {
-    let mut size: u32 = 0;
-    if n * 32 < (1 << _IOC_SIZEBITS) {
-        size = n * 32;
-    }
-    (SPI_IOC_MESSAGE_BASE | (size << _IOC_SIZESHIFT)) as u64
+    let size = if n * 32 < (1 << _IOC_SIZEBITS) {
+        n * 32
+    } else {
+        0
+    };
+    u64::from(SPI_IOC_MESSAGE_BASE | (size << _IOC_SIZESHIFT))
 }
 
 bitflags! {

vhost-device-spi/src/main.rs

@@ -71,7 +71,7 @@ struct SpiConfiguration {
 
 impl SpiConfiguration {
     fn from(args: SpiArgs) -> Result<Self> {
-        Ok(SpiConfiguration {
+        Ok(Self {
             socket_path: args.socket_path,
             socket_count: args.socket_count.get(),
             device: args.device,

vhost-device-spi/src/spi.rs

@@ -20,17 +20,17 @@ use crate::{linux_spi::*, vhu_spi::VirtioSpiConfig, virtio_spi::*};
 
 type Result<T> = std::result::Result<T, Error>;
 
-#[derive(Copy, Clone, Debug, PartialEq, ThisError)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, ThisError)]
 /// Errors related to low level spi helpers
-pub(crate) enum Error {
+pub enum Error {
     #[error("Ioctl command failed for {0} operation: {1}")]
     IoctlFailure(&'static str, IoError),
     #[error("Failed to open spi controller")]
     DeviceOpenFailed,
 }
 
 /// SPI definitions
-pub(crate) struct SpiTransReq {
+pub struct SpiTransReq {
     pub tx_buf: Vec<u8>,
     pub rx_buf: Vec<u8>,
     pub trans_len: u32,
@@ -51,7 +51,7 @@ pub(crate) struct SpiTransReq {
 /// be used outside of this crate. The purpose of this trait is to provide a
 /// mock implementation for the SPI driver so that we can test the SPI
 /// functionality without the need of a physical device.
-pub(crate) trait SpiDevice {
+pub trait SpiDevice {
     /// Open the device specified by the controller path.
     fn open(path: &Path) -> Result<Self>
     where
@@ -85,13 +85,13 @@ pub(crate) trait SpiDevice {
 /// A physical SPI device. This structure can only be initialized on hosts
 /// where `/dev/spidevX.Y` is available.
 #[derive(Debug)]
-pub(crate) struct PhysDevice {
+pub struct PhysDevice {
     file: File,
 }
 
 impl SpiDevice for PhysDevice {
     fn open(path: &Path) -> Result<Self> {
-        Ok(PhysDevice {
+        Ok(Self {
             file: OpenOptions::new()
                 .read(true)
                 .write(true)
@@ -206,6 +206,7 @@ impl SpiDevice for PhysDevice {
         }
     }
 
+    #[allow(clippy::cognitive_complexity)]
     fn detect_supported_features(&self) -> Result<VirtioSpiConfig> {
         // supported cs_max_number 1
         // can't set cs timing from userland in Linux, reserve cs timing as 0
@@ -468,20 +469,20 @@ impl SpiDevice for PhysDevice {
 }
 
 #[derive(Debug)]
-pub(crate) struct SpiController<D: SpiDevice> {
+pub struct SpiController<D: SpiDevice> {
     device: D,
     config: VirtioSpiConfig,
 }
 
 impl<D: SpiDevice> SpiController<D> {
     // Creates a new controller corresponding to `device`.
-    pub(crate) fn new(device: D) -> Result<SpiController<D>> {
+    pub(crate) fn new(device: D) -> Result<Self> {
         let config: VirtioSpiConfig = device.detect_supported_features()?;
 
-        Ok(SpiController { device, config })
+        Ok(Self { device, config })
     }
 
-    pub(crate) fn config(&self) -> &VirtioSpiConfig {
+    pub(crate) const fn config(&self) -> &VirtioSpiConfig {
         &self.config
     }
 

vhost-device-spi/src/vhu_spi.rs

@@ -38,7 +38,7 @@ type Result<T> = std::result::Result<T, Error>;
 
 #[derive(Copy, Clone, Debug, Eq, PartialEq, ThisError)]
 /// Errors related to vhost-device-spi daemon.
-pub(crate) enum Error {
+pub enum Error {
     #[error("TX length  {0} and RX length {1} don't match")]
     TxRxTrnasLenNotEqual(u32, u32),
     #[error("TX length and RX length are both zero")]
@@ -65,7 +65,7 @@ pub(crate) enum Error {
 
 impl From<Error> for io::Error {
     fn from(e: Error) -> Self {
-        io::Error::new(io::ErrorKind::Other, e)
+        Self::new(io::ErrorKind::Other, e)
     }
 }
 
@@ -113,9 +113,9 @@ struct VirtioSpiTransferResult {
 unsafe impl ByteValued for VirtioSpiTransferResult {}
 
 /// Virtio SPI Configuration
-#[derive(Copy, Clone, Debug, Default, PartialEq)]
+#[derive(Copy, Clone, Debug, Default, PartialEq, Eq)]
 #[repr(C)]
-pub(crate) struct VirtioSpiConfig {
+pub struct VirtioSpiConfig {
     pub(crate) cs_max_number: u8,
     pub(crate) cs_change_supported: u8,
     pub(crate) tx_nbits_supported: u8,
@@ -133,7 +133,7 @@ pub(crate) struct VirtioSpiConfig {
 // reading its content from byte array.
 unsafe impl ByteValued for VirtioSpiConfig {}
 
-pub(crate) struct VhostUserSpiBackend<D: SpiDevice> {
+pub struct VhostUserSpiBackend<D: SpiDevice> {
     spi_ctrl: Arc<SpiController<D>>,
     event_idx: bool,
     pub exit_event: EventFd,
@@ -144,7 +144,7 @@ type SpiDescriptorChain = DescriptorChain<GuestMemoryLoadGuard<GuestMemoryMmap<(
 
 impl<D: SpiDevice> VhostUserSpiBackend<D> {
     pub fn new(spi_ctrl: Arc<SpiController<D>>) -> Result<Self> {
-        Ok(VhostUserSpiBackend {
+        Ok(Self {
             spi_ctrl,
             event_idx: false,
             exit_event: EventFd::new(EFD_NONBLOCK).map_err(|_| Error::EventFdFailed)?,
@@ -352,7 +352,7 @@ impl<D: SpiDevice> VhostUserSpiBackend<D> {
                         status: ResponseStatus::TransErr as u8,
                     };
 
-                    for desc_chain in requests.clone() {
+                    for desc_chain in requests {
                         let len = size_of::<VirtioSpiTransferResult>() as u32;
                         let mem = atomic_mem.memory();