Bump Rust to 1.75 and fix new Clippy lints (#1123)

Author: mkeeter

crudd/src/main.rs

@@ -544,14 +544,10 @@ async fn handle_signals(
     mut signals: Signals,
     early_shutdown: oneshot::Sender<()>,
 ) {
-    while let Some(signal) = signals.next().await {
-        match signal {
-            SIGUSR1 => {
-                early_shutdown.send(()).unwrap();
-                break;
-            }
-            _ => unreachable!(),
-        }
+    match signals.next().await {
+        Some(SIGUSR1) => early_shutdown.send(()).unwrap(),
+        Some(_) => unreachable!(),
+        None => (), // signal sender is dropped
     }
 }
 

crutest/src/cli.rs

@@ -658,24 +658,22 @@ pub async fn start_cli_client(attach: SocketAddr) -> Result<()> {
         let tcp = sock.connect(attach);
         tokio::pin!(tcp);
 
-        let mut tcp: TcpStream = loop {
-            tokio::select! {
-                _ = &mut deadline => {
-                    println!("connect timeout");
-                    continue 'outer;
-                }
-                tcp = &mut tcp => {
-                    match tcp {
-                        Ok(tcp) => {
-                            println!("connected to {}", attach);
-                            break tcp;
-                        }
-                        Err(e) => {
-                            println!("connect to {0} failure: {1:?}",
-                                attach, e);
-                            tokio::time::sleep_until(deadline_secs(10.0)).await;
-                            continue 'outer;
-                        }
+        let mut tcp: TcpStream = tokio::select! {
+            _ = &mut deadline => {
+                println!("connect timeout");
+                continue 'outer;
+            }
+            tcp = &mut tcp => {
+                match tcp {
+                    Ok(tcp) => {
+                        println!("connected to {}", attach);
+                        tcp
+                    }
+                    Err(e) => {
+                        println!("connect to {0} failure: {1:?}",
+                            attach, e);
+                        tokio::time::sleep_until(deadline_secs(10.0)).await;
+                        continue 'outer;
                     }
                 }
             }

downstairs/src/dump.rs

@@ -725,7 +725,7 @@ async fn show_extent_block(
         println!();
 
         print!("{}  ", String::from_utf8(vec![b'-'; 6])?);
-        for (_, _) in dvec.iter().enumerate() {
+        for _ in &dvec {
             print!("{} ", String::from_utf8(vec![b'-'; 24])?);
         }
         if !only_show_differences {
@@ -784,7 +784,7 @@ async fn show_extent_block(
         println!();
 
         print!("{}  ", String::from_utf8(vec![b'-'; 6])?);
-        for (_, _) in dvec.iter().enumerate() {
+        for _ in &dvec {
             print!("{} ", String::from_utf8(vec![b'-'; 32])?);
         }
         if !only_show_differences {
@@ -848,7 +848,7 @@ async fn show_extent_block(
         println!();
 
         print!("{}  ", String::from_utf8(vec![b'-'; 6])?);
-        for (_, _) in dvec.iter().enumerate() {
+        for _ in &dvec {
             print!("{} ", String::from_utf8(vec![b'-'; 16])?);
         }
         if !only_show_differences {

pantry/src/pantry.rs

@@ -307,10 +307,8 @@ impl PantryEntry {
         let volume_block_size =
             self.volume.check_data_size(size).await? as usize;
 
-        let mut buffer = crucible::Buffer::new(
-            size / volume_block_size as usize,
-            volume_block_size,
-        );
+        let mut buffer =
+            crucible::Buffer::new(size / volume_block_size, volume_block_size);
 
         self.volume
             .read_from_byte_offset(offset, &mut buffer)

protocol/src/lib.rs

@@ -150,7 +150,7 @@ impl ReadResponse {
     }
 
     pub fn first_hash(&self) -> Option<u64> {
-        self.block_contexts.get(0).map(|ctx| ctx.hash)
+        self.block_contexts.first().map(|ctx| ctx.hash)
     }
 
     pub fn encryption_contexts(&self) -> Vec<Option<&EncryptionContext>> {

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.73"
+channel = "1.75"
 profile = "default"

upstairs/src/test.rs

@@ -116,12 +116,10 @@ pub(crate) mod up_test {
             assert_eq!(span.buffer()[i], 0);
         }
 
-        let mut data = vec![0u8; 64];
+        let mut data = [0u8; 64];
         span.read_from_blocks_into_buffer(&mut data[..]);
 
-        for i in 0..64 {
-            assert_eq!(data[i], 1);
-        }
+        assert_eq!(data, [1; 64]);
     }
 
     /*