From b26f41d9b3d90b25bbcfa8d974de56865f50e46b Mon Sep 17 00:00:00 2001
From: Rain <rain@oxide.computer>
Date: Mon, 27 Nov 2023 14:29:59 -0800
Subject: [PATCH] Update for Rust 1.74 changes

---
 bootstore/src/schemes/v0/request_manager.rs | 2 +-
 common/src/api/external/mod.rs              | 2 +-
 nexus/db-queries/src/db/queries/volume.rs   | 7 ++++---
 nexus/db-queries/src/db/saga_recovery.rs    | 3 +--
 wicket/src/ui/widgets/popup.rs              | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bootstore/src/schemes/v0/request_manager.rs b/bootstore/src/schemes/v0/request_manager.rs
index 780213430c..90466fdc07 100644
--- a/bootstore/src/schemes/v0/request_manager.rs
+++ b/bootstore/src/schemes/v0/request_manager.rs
@@ -109,7 +109,7 @@ impl RequestManager {
         let expiry = now + self.config.rack_init_timeout;
         let mut acks = InitAcks::default();
         acks.expected =
-            packages.keys().cloned().filter(|id| id != &self.id).collect();
+            packages.keys().filter(|&id| id != &self.id).cloned().collect();
         let req = TrackableRequest::InitRack {
             rack_uuid,
             packages: packages.clone(),
diff --git a/common/src/api/external/mod.rs b/common/src/api/external/mod.rs
index adf661516a..3e58d1d4d4 100644
--- a/common/src/api/external/mod.rs
+++ b/common/src/api/external/mod.rs
@@ -409,7 +409,7 @@ impl SemverVersion {
     /// This is the official ECMAScript-compatible validation regex for
     /// semver:
     /// <https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string>
-    const VALIDATION_REGEX: &str = r"^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$";
+    const VALIDATION_REGEX: &'static str = r"^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$";
 }
 
 impl JsonSchema for SemverVersion {
diff --git a/nexus/db-queries/src/db/queries/volume.rs b/nexus/db-queries/src/db/queries/volume.rs
index 31882dca89..2c1a9af19b 100644
--- a/nexus/db-queries/src/db/queries/volume.rs
+++ b/nexus/db-queries/src/db/queries/volume.rs
@@ -412,10 +412,11 @@ pub struct DecreaseCrucibleResourceCountAndSoftDeleteVolume {
 }
 
 impl DecreaseCrucibleResourceCountAndSoftDeleteVolume {
-    const UPDATED_REGION_SNAPSHOTS_TABLE: &str = "updated_region_snapshots";
-    const REGION_SNAPSHOTS_TO_CLEAN_UP_TABLE: &str =
+    const UPDATED_REGION_SNAPSHOTS_TABLE: &'static str =
+        "updated_region_snapshots";
+    const REGION_SNAPSHOTS_TO_CLEAN_UP_TABLE: &'static str =
         "region_snapshots_to_clean_up";
-    const UPDATED_VOLUME_TABLE: &str = "updated_volume";
+    const UPDATED_VOLUME_TABLE: &'static str = "updated_volume";
 
     pub fn new(volume_id: Uuid, snapshot_addrs: Vec<String>) -> Self {
         Self {
diff --git a/nexus/db-queries/src/db/saga_recovery.rs b/nexus/db-queries/src/db/saga_recovery.rs
index f3eada1645..802093b889 100644
--- a/nexus/db-queries/src/db/saga_recovery.rs
+++ b/nexus/db-queries/src/db/saga_recovery.rs
@@ -143,8 +143,7 @@ where
             .await
         });
 
-        let mut completion_futures = vec![];
-        completion_futures.reserve(recovery_futures.len());
+        let mut completion_futures = Vec::with_capacity(recovery_futures.len());
         // Loads and resumes all sagas in serial.
         for recovery_future in recovery_futures {
             let saga_complete_future = recovery_future.await?;
diff --git a/wicket/src/ui/widgets/popup.rs b/wicket/src/ui/widgets/popup.rs
index 19d7aa18b1..fb8c0f1f24 100644
--- a/wicket/src/ui/widgets/popup.rs
+++ b/wicket/src/ui/widgets/popup.rs
@@ -464,7 +464,7 @@ pub fn draw_buttons(
     let button_rects = Layout::default()
         .direction(Direction::Horizontal)
         .horizontal_margin(2)
-        .constraints(constraints.as_ref())
+        .constraints(constraints)
         .split(rect);
 
     let block = Block::default()