placate clippy

oxidecomputer · Jul 30, 2024 · 71b0ed0 · 71b0ed0
1 parent a97fff1
commit 71b0ed0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/sled-agent/src/instance.rs b/sled-agent/src/instance.rs
@@ -976,6 +976,7 @@ impl Instance {
     /// * `services`: A set of instance manager-provided services.
     /// * `sled_identifiers`: Sled-related metadata used to track statistics.
     /// * `metadata`: Instance-related metadata used to track statistics.
+    #[allow(clippy::too_many_arguments)]
     pub(crate) fn new(
         log: Logger,
         id: InstanceUuid,

diff --git a/sled-agent/src/instance_manager.rs b/sled-agent/src/instance_manager.rs
@@ -162,7 +162,7 @@ impl InstanceManager {
                 instance_runtime,
                 vmm_runtime,
                 propolis_addr,
-                sled_identifiers,
+                sled_identifiers: Box::new(sled_identifiers),
                 metadata,
                 tx,
             })
@@ -345,7 +345,12 @@ enum InstanceManagerRequest {
         instance_runtime: InstanceRuntimeState,
         vmm_runtime: VmmRuntimeState,
         propolis_addr: SocketAddr,
-        sled_identifiers: SledIdentifiers,
+        // These are boxed because they are, apparently, quite large, and Clippy
+        // whinges about the overall size of this variant relative to the
+        // others. Since we will generally send `EnsureRegistered` requests much
+        // less frequently than most of the others, boxing this seems like a
+        // reasonable choice...
+        sled_identifiers: Box<SledIdentifiers>,
         metadata: InstanceMetadata,
         tx: oneshot::Sender<Result<SledInstanceState, Error>>,
     },
@@ -475,7 +480,7 @@ impl InstanceManagerRunner {
                                 instance_runtime,
                                 vmm_runtime,
                                 propolis_addr,
-                                sled_identifiers,
+                                *sled_identifiers,
                                 metadata
                             ).await).map_err(|_| Error::FailedSendClientClosed)
                         },