clippy

Author: jgallagher

sled-agent/config-reconciler/src/handle.rs

@@ -475,7 +475,7 @@ impl AvailableDatasetsReceiver {
             AvailableDatasetsReceiverInner::FakeStatic(pools) => pools
                 .iter()
                 .map(|(pool, path)| PathInPool {
-                    pool: ZpoolOrRamdisk::Zpool(pool.clone()),
+                    pool: ZpoolOrRamdisk::Zpool(*pool),
                     path: path.join(U2_DEBUG_DATASET),
                 })
                 .collect(),
@@ -498,7 +498,7 @@ impl AvailableDatasetsReceiver {
             AvailableDatasetsReceiverInner::FakeStatic(pools) => pools
                 .iter()
                 .map(|(pool, path)| PathInPool {
-                    pool: ZpoolOrRamdisk::Zpool(pool.clone()),
+                    pool: ZpoolOrRamdisk::Zpool(*pool),
                     path: path.join(ZONE_DATASET),
                 })
                 .collect(),

sled-agent/config-reconciler/src/internal_disks.rs

@@ -325,9 +325,9 @@ impl InternalDisks {
         &self.mount_config
     }
 
-    pub fn boot_disk_zpool(&self) -> Option<&ZpoolName> {
+    pub fn boot_disk_zpool(&self) -> Option<ZpoolName> {
         self.disks.iter().find_map(|d| {
-            if d.is_boot_disk() { Some(&d.zpool_name) } else { None }
+            if d.is_boot_disk() { Some(d.zpool_name) } else { None }
         })
     }
 

sled-agent/src/services.rs

@@ -848,7 +848,9 @@ impl ServiceManager {
     /// - `sidecar_revision`: Rev of attached sidecar, if present.
     /// - `switch_zone_maghemite_links`: List of physical links on which
     ///    maghemite should listen.
+    /// - `zone_image_resolver`: how to find Omicron zone images
     /// - `internal_disks_rx`: watch channel for changes to internal disks
+    #[allow(clippy::too_many_arguments)]
     pub(crate) fn new(
         log: &Logger,
         ddm_reconciler: DdmReconciler,

sled-agent/src/sled_agent.rs

@@ -428,8 +428,7 @@ impl SledAgent {
             .internal_disks_rx()
             .current()
             .boot_disk_zpool()
-            .ok_or_else(|| Error::BootDiskNotFound)?
-            .clone();
+            .ok_or_else(|| Error::BootDiskNotFound)?;
 
         // Configure a swap device of the configured size before other system setup.
         match config.swap_device_size_gb {