chore(code): simple code cleanup

crates/ctl/src/cli/mod.rs

@@ -51,7 +51,7 @@ impl ControlCommand {
 
             ControlCommands::Device(device) => device.run(client, events).await,
 
-            ControlCommands::Host(snoop) => snoop.run(client, events).await,
+            ControlCommands::Host(host) => host.run(client, events).await,
         }
     }
 }

crates/ctl/src/cli/zone/top.rs

@@ -106,7 +106,7 @@ impl ZoneTopApp {
                         break;
                     }
                 }
-            };
+            }
         }
         Ok(())
     }

crates/daemon/src/control.rs

@@ -265,7 +265,7 @@ impl ControlService for DaemonControlService {
                             break;
                         }
                     }
-                };
+                }
             }
         };
 

crates/daemon/src/idm.rs

@@ -205,7 +205,7 @@ impl DaemonIdm {
                         break;
                     }
                 }
-            };
+            }
         }
         Ok(())
     }

crates/daemon/src/reconcile/zone/mod.rs

@@ -132,7 +132,7 @@ impl ZoneReconciler {
                             error!("runtime reconciler failed: {}", error);
                         }
                     }
-                };
+                }
             }
         }))
     }

crates/krata/src/idm/client.rs

@@ -34,7 +34,7 @@ use super::{
 
 type OneshotRequestMap<R> = Arc<Mutex<HashMap<u64, oneshot::Sender<<R as IdmRequest>::Response>>>>;
 type StreamRequestMap<R> = Arc<Mutex<HashMap<u64, Sender<<R as IdmRequest>::Response>>>>;
-type StreamRequestUpdateMap<R> = Arc<Mutex<HashMap<u64, mpsc::Sender<R>>>>;
+type StreamRequestUpdateMap<R> = Arc<Mutex<HashMap<u64, Sender<R>>>>;
 pub type IdmInternalClient = IdmClient<internal::Request, internal::Event>;
 
 const IDM_PACKET_QUEUE_LEN: usize = 100;

crates/network/src/autonet.rs

@@ -187,7 +187,7 @@ impl AutoNetworkWatcher {
                 _ = sleep(Duration::from_secs(10)) => {
                     break;
                 }
-            };
+            }
         }
         Ok(())
     }

crates/oci/examples/squashify.rs

@@ -25,7 +25,7 @@ async fn main() -> Result<()> {
     let (context, mut receiver) = OciProgressContext::create();
     tokio::task::spawn(async move {
         loop {
-            if (receiver.changed().await).is_err() {
+            if receiver.changed().await.is_err() {
                 break;
             }
             let progress = receiver.borrow_and_update();

crates/oci/src/packer/backend.rs

@@ -97,13 +97,13 @@ impl OciPackerBackend for OciPackerMkSquashfs {
                     status = &mut wait => {
                         break status;
                     }
-                };
+                }
             } else {
                 select! {
                     status = &mut wait => {
                         break status;
                     }
-                };
+                }
             }
         };
         if let Some(writer) = writer {
@@ -172,13 +172,13 @@ impl OciPackerBackend for OciPackerMkfsErofs {
                     status = &mut wait => {
                         break status;
                     }
-                };
+                }
             } else {
                 select! {
                     status = &mut wait => {
                         break status;
                     }
-                };
+                }
             }
         };
         if let Some(writer) = writer {

crates/oci/src/progress.rs

@@ -228,7 +228,7 @@ impl OciBoundProgress {
         context.update(&progress);
         let mut receiver = self.context.subscribe();
         tokio::task::spawn(async move {
-            while (receiver.changed().await).is_ok() {
+            while receiver.changed().await.is_ok() {
                 context
                     .sender
                     .send_replace(receiver.borrow_and_update().clone());

crates/runtime/src/channel.rs

@@ -503,7 +503,7 @@ impl KrataChannelBackendProcessor {
                         break;
                     }
                 }
-            };
+            }
         }
         Ok(())
     }

crates/xen/xenclient/src/lib.rs

@@ -130,8 +130,7 @@ impl<P: BootSetupPlatform> XenClient<P> {
         match self.init(created.domid, config, &created).await {
             Ok(_) => Ok(created),
             Err(err) => {
-                // ignore since destroying a domain is best
+                // ignore since destroying a domain is best-effort when an error occurs
-                // effort when an error occurs
                 let _ = self.domain_manager.destroy(created.domid).await;
                 Err(err)
             }

crates/xen/xenevtchn/src/lib.rs

@@ -185,9 +185,9 @@ impl EventChannelProcessor {
                 if self.flag.load(Ordering::Acquire) {
                     break;
                 }
-                warn!("failed to process event channel notifications: {}", error);
+            };
-            }
+        }
-        });
+
         Ok(())
     }
 

crates/xen/xenstore/src/bus.rs

@@ -298,7 +298,7 @@ impl XsdSocketProcessor {
                         break;
                     }
                 }
-            };
+            }
         }
         Ok(())
     }

crates/zone/src/background.rs

@@ -95,7 +95,7 @@ impl ZoneBackground {
                         break;
                     }
                 }
-            };
+            }
         }
         Ok(())
     }