From 178e20e4a5fe4727752e63edb3f026476032826e Mon Sep 17 00:00:00 2001
From: Sean Klein <sean@oxide.computer>
Date: Fri, 26 Jul 2024 13:35:36 -0700
Subject: [PATCH] Clippy and helios

---
 sled-agent/src/rack_setup/plan/service.rs | 2 +-
 sled-storage/src/manager.rs               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sled-agent/src/rack_setup/plan/service.rs b/sled-agent/src/rack_setup/plan/service.rs
index ec19863bef..6f763dddbf 100644
--- a/sled-agent/src/rack_setup/plan/service.rs
+++ b/sled-agent/src/rack_setup/plan/service.rs
@@ -925,7 +925,7 @@ impl SledInfo {
         // enumerates the valid zpool indexes.
         let allocator = self
             .u2_zpool_allocators
-            .entry(kind.clone())
+            .entry(kind)
             .or_insert_with(|| Box::new(0..self.u2_zpools.len()));
         match allocator.next() {
             None => Err(PlanError::NotEnoughSleds),
diff --git a/sled-storage/src/manager.rs b/sled-storage/src/manager.rs
index fd28b8a67d..59c1dd8bf5 100644
--- a/sled-storage/src/manager.rs
+++ b/sled-storage/src/manager.rs
@@ -1086,7 +1086,6 @@ impl StorageManager {
 /// systems.
 #[cfg(all(test, target_os = "illumos"))]
 mod tests {
-    use crate::dataset::DatasetType;
     use crate::disk::RawSyntheticDisk;
     use crate::manager_test_harness::StorageManagerTestHarness;
     use crate::resources::DiskManagementError;
@@ -1094,6 +1093,7 @@ mod tests {
     use super::*;
     use camino_tempfile::tempdir_in;
     use omicron_common::api::external::Generation;
+    use omicron_common::disk::DatasetKind;
     use omicron_common::ledger;
     use omicron_test_utils::dev::test_setup_log;
     use sled_hardware::DiskFirmware;
@@ -1562,7 +1562,7 @@ mod tests {
         let dataset_id = Uuid::new_v4();
         let zpool_name = ZpoolName::new_external(config.disks[0].pool_id);
         let dataset_name =
-            DatasetName::new(zpool_name.clone(), DatasetType::Crucible);
+            DatasetName::new(zpool_name.clone(), DatasetKind::Crucible);
         harness
             .handle()
             .upsert_filesystem(dataset_id, dataset_name)