Merge #1896

1896: build: update nix and rust compiler r=tiagolobocastro a=tiagolobocastro

Apply all the new clippy suggestions.

Co-authored-by: Tiago Castro <[email protected]>

Author: mayastor-bors

Cargo.lock

@@ -125,15 +125,12 @@ pub async fn test_write_to_file(
 
         for k in 0..src_buf.len() {
             if src_buf[k] != dst_buf[k] {
-                return Err(std::io::Error::new(
-                    std::io::ErrorKind::Other,
-                    format!(
-                        "Data validation failed at {}: written {:?}, read {:?}",
-                        pos + k as u64,
-                        src_buf[k],
-                        dst_buf[k]
-                    ),
-                ));
+                return Err(std::io::Error::other(format!(
+                    "Data validation failed at {}: written {:?}, read {:?}",
+                    pos + k as u64,
+                    src_buf[k],
+                    dst_buf[k]
+                )));
             }
         }
 
@@ -170,7 +167,7 @@ pub async fn compare_files(
     path_a: impl AsRef<Path>,
     path_b: impl AsRef<Path>,
 ) -> std::io::Result<()> {
-    use std::io::{Error, ErrorKind};
+    use std::io::Error;
 
     let name_a = path_a.as_ref();
     let name_b = path_b.as_ref();
@@ -201,10 +198,9 @@ pub async fn compare_files(
         let nb = fb.read(&mut buf_b).await?;
 
         if na != nb {
-            return Err(Error::new(
-                ErrorKind::Other,
-                format!("Size of file {name_a:?} != size of {name_b:?}"),
-            ));
+            return Err(Error::other(format!(
+                "Size of file {name_a:?} != size of {name_b:?}"
+            )));
         }
 
         if na == 0 {
@@ -213,16 +209,13 @@ pub async fn compare_files(
 
         for i in 0..na {
             if buf_a[i] != buf_b[i] {
-                return Err(Error::new(
-                    ErrorKind::Other,
-                    format!(
-                        "Miscompare at {pos}: {na:?} {va:#02x} != {nb:?} {vb:#02x}",
-                        na = name_a,
-                        va = buf_a[i],
-                        nb = name_b,
-                        vb = buf_b[i],
-                    ),
-                ));
+                return Err(Error::other(format!(
+                    "Miscompare at {pos}: {na:?} {va:#02x} != {nb:?} {vb:#02x}",
+                    na = name_a,
+                    va = buf_a[i],
+                    nb = name_b,
+                    vb = buf_b[i],
+                )));
             }
             pos += 1;
         }

io-engine-tests/src/file_io.rs

@@ -352,13 +352,10 @@ pub async fn spawn_fio_task(fio: &Fio) -> std::io::Result<()> {
     if fio.exit == 0 {
         Ok(())
     } else {
-        Err(std::io::Error::new(
-            std::io::ErrorKind::Other,
-            format!(
-                "SPDK FIO error: {exit} {err_msg}",
-                exit = fio.exit,
-                err_msg = fio.err_messages.join("\n")
-            ),
-        ))
+        Err(std::io::Error::other(format!(
+            "SPDK FIO error: {exit} {err_msg}",
+            exit = fio.exit,
+            err_msg = fio.err_messages.join("\n")
+        )))
     }
 }

io-engine-tests/src/fio.rs

@@ -588,7 +588,7 @@ pub fn setup_rdma_rxe_device() -> String {
         .get(1)
         .expect("interface not found")
         .as_str();
-    println!("Using interface {} to create rdma rxe device", iface);
+    println!("Using interface {iface} to create rdma rxe device");
 
     // now create the software rdma device.
     let _ = run_command_args(

io-engine-tests/src/lib.rs

@@ -53,7 +53,7 @@ impl TryFrom<&Url> for Aio {
 
         let path_is_blockdev = std::fs::metadata(url.path())
             .ok()
-            .map_or(false, |meta| meta.file_type().is_block_device());
+            .is_some_and(|meta| meta.file_type().is_block_device());
 
         let mut parameters: HashMap<String, String> = url.query_pairs().into_owned().collect();
 

io-engine/src/bdev/aio.rs

@@ -124,7 +124,7 @@ impl TryFrom<&Url> for Ftl {
             .decode_utf8()
             .map_err(|e| BdevError::InvalidUri {
                 uri: uri.to_string(),
-                message: format!("Could not percent decode bbdev_uri sub-uri - {}", e),
+                message: format!("Could not percent decode bbdev_uri sub-uri - {e}"),
             })?
             .to_string();
 
@@ -137,7 +137,7 @@ impl TryFrom<&Url> for Ftl {
             .decode_utf8()
             .map_err(|e| BdevError::InvalidUri {
                 uri: uri.to_string(),
-                message: format!("Could not percent decode cbdev_uri sub-uri - {}", e),
+                message: format!("Could not percent decode cbdev_uri sub-uri - {e}"),
             })?
             .to_string();
 

io-engine/src/bdev/ftl.rs

@@ -129,9 +129,7 @@ impl<'n> Nexus<'n> {
         let child_bdev = match device_lookup(&name) {
             Some(child) => {
                 if child.block_len() != self.block_len()
-                    || self
-                        .min_num_blocks()
-                        .map_or(true, |n| n > child.num_blocks())
+                    || self.min_num_blocks().is_none_or(|n| n > child.num_blocks())
                 {
                     if let Err(err) = device_destroy(uri).await {
                         error!(

io-engine/src/bdev/nexus/nexus_bdev_children.rs

@@ -323,8 +323,7 @@ impl<'n> Nexus<'n> {
                         return Err(Error::SaveStateFailed {
                             source: StoreError::Txn {
                                 key: key.clone(),
-                                source: EtcdErr::IoError(std::io::Error::new(
-                                    std::io::ErrorKind::Other,
+                                source: EtcdErr::IoError(std::io::Error::other(
                                     "Txn CompareOp failed",
                                 )),
                             },

io-engine/src/bdev/nexus/nexus_persistence.rs

@@ -38,7 +38,7 @@ impl TryFrom<&Url> for Uring {
 
         let path_is_blockdev = std::fs::metadata(url.path())
             .ok()
-            .map_or(false, |meta| meta.file_type().is_block_device());
+            .is_some_and(|meta| meta.file_type().is_block_device());
 
         let mut parameters: HashMap<String, String> = url.query_pairs().into_owned().collect();
 

io-engine/src/bdev/uring.rs

@@ -54,10 +54,10 @@ async fn main() {
         }
     };
     if let Err(error) = result {
-        eprintln!("{}", error);
+        eprintln!("{error}");
         use snafu::ErrorCompat;
         if let Some(bt) = ErrorCompat::backtrace(&error) {
-            eprintln!("{:#?}", bt);
+            eprintln!("{bt:#?}");
         }
         std::process::exit(1);
     }