diff --git a/crates/ctl/src/cli/mod.rs b/crates/ctl/src/cli/mod.rs
index 76e0533..80dab51 100644
--- a/crates/ctl/src/cli/mod.rs
+++ b/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,
         }
     }
 }
diff --git a/crates/ctl/src/cli/zone/top.rs b/crates/ctl/src/cli/zone/top.rs
index 843192c..47a7eb4 100644
--- a/crates/ctl/src/cli/zone/top.rs
+++ b/crates/ctl/src/cli/zone/top.rs
@@ -106,7 +106,7 @@ impl ZoneTopApp {
                         break;
                     }
                 }
-            };
+            }
         }
         Ok(())
     }
diff --git a/crates/daemon/src/control.rs b/crates/daemon/src/control.rs
index fa14cd7..576cca5 100644
--- a/crates/daemon/src/control.rs
+++ b/crates/daemon/src/control.rs
@@ -265,7 +265,7 @@ impl ControlService for DaemonControlService {
                             break;
                         }
                     }
-                };
+                }
             }
         };
 
diff --git a/crates/daemon/src/idm.rs b/crates/daemon/src/idm.rs
index 6ff1607..7e22ff0 100644
--- a/crates/daemon/src/idm.rs
+++ b/crates/daemon/src/idm.rs
@@ -198,7 +198,7 @@ impl DaemonIdm {
                         break;
                     }
                 }
-            };
+            }
         }
         Ok(())
     }
diff --git a/crates/daemon/src/reconcile/zone/mod.rs b/crates/daemon/src/reconcile/zone/mod.rs
index 1be6f46..89c38b1 100644
--- a/crates/daemon/src/reconcile/zone/mod.rs
+++ b/crates/daemon/src/reconcile/zone/mod.rs
@@ -132,7 +132,7 @@ impl ZoneReconciler {
                             error!("runtime reconciler failed: {}", error);
                         }
                     }
-                };
+                }
             }
         }))
     }
diff --git a/crates/krata/src/idm/client.rs b/crates/krata/src/idm/client.rs
index a935250..f0889da 100644
--- a/crates/krata/src/idm/client.rs
+++ b/crates/krata/src/idm/client.rs
@@ -33,7 +33,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;
diff --git a/crates/network/src/autonet.rs b/crates/network/src/autonet.rs
index 6a5477a..ea80284 100644
--- a/crates/network/src/autonet.rs
+++ b/crates/network/src/autonet.rs
@@ -187,7 +187,7 @@ impl AutoNetworkWatcher {
                 _ = sleep(Duration::from_secs(10)) => {
                     break;
                 }
-            };
+            }
         }
         Ok(())
     }
diff --git a/crates/oci/examples/squashify.rs b/crates/oci/examples/squashify.rs
index c6361c1..62816d3 100644
--- a/crates/oci/examples/squashify.rs
+++ b/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();
diff --git a/crates/oci/src/packer/backend.rs b/crates/oci/src/packer/backend.rs
index f82982f..63b838b 100644
--- a/crates/oci/src/packer/backend.rs
+++ b/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 {
diff --git a/crates/oci/src/progress.rs b/crates/oci/src/progress.rs
index 68b675a..42b975e 100644
--- a/crates/oci/src/progress.rs
+++ b/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());
diff --git a/crates/runtime/src/channel.rs b/crates/runtime/src/channel.rs
index 0c5ee43..dd08bdb 100644
--- a/crates/runtime/src/channel.rs
+++ b/crates/runtime/src/channel.rs
@@ -505,7 +505,7 @@ impl KrataChannelBackendProcessor {
                         }
                     }
                 }
-            };
+            }
         }
         Ok(())
     }
diff --git a/crates/xen/xenclient/src/lib.rs b/crates/xen/xenclient/src/lib.rs
index 5c3f678..7954dda 100644
--- a/crates/xen/xenclient/src/lib.rs
+++ b/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
-                // effort when an error occurs
+                // ignore since destroying a domain is best-effort when an error occurs
                 let _ = self.domain_manager.destroy(created.domid).await;
                 Err(err)
             }
diff --git a/crates/xen/xenevtchn/src/lib.rs b/crates/xen/xenevtchn/src/lib.rs
index 0fb78c6..f1f145f 100644
--- a/crates/xen/xenevtchn/src/lib.rs
+++ b/crates/xen/xenevtchn/src/lib.rs
@@ -210,7 +210,7 @@ impl EventChannel {
                         }
                     }
                 }
-            };
+            }
         }
 
         Ok(())
diff --git a/crates/xen/xenstore/src/bus.rs b/crates/xen/xenstore/src/bus.rs
index 5a890f5..9508c05 100644
--- a/crates/xen/xenstore/src/bus.rs
+++ b/crates/xen/xenstore/src/bus.rs
@@ -297,7 +297,7 @@ impl XsdSocketProcessor {
                         break;
                     }
                 }
-            };
+            }
         }
         Ok(())
     }
diff --git a/crates/zone/src/background.rs b/crates/zone/src/background.rs
index bb44d51..3971021 100644
--- a/crates/zone/src/background.rs
+++ b/crates/zone/src/background.rs
@@ -91,7 +91,7 @@ impl ZoneBackground {
                         break;
                     }
                 }
-            };
+            }
         }
         Ok(())
     }