Update Rust crate uuid to 1.12.0 (#7070)

Co-authored-by: iliana etaoin <[email protected]>
oxidecomputer · Jan 17, 2025 · de6a440 · de6a440
1 parent 9d981a2
commit de6a440
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -672,7 +672,7 @@ update-common = { path = "update-common" }
 update-engine = { path = "update-engine" }
 url = "2.5.3"
 usdt = "0.5.0"
-uuid = { version = "1.10.0", features = ["serde", "v4"] }
+uuid = { version = "1.12.0", features = ["serde", "v4"] }
 uzers = "0.12"
 walkdir = "2.5"
 whoami = "1.5"

diff --git a/nexus/db-queries/src/db/datastore/volume.rs b/nexus/db-queries/src/db/datastore/volume.rs
@@ -4122,7 +4122,7 @@ mod tests {
 
         assert_eq!(
             region_snapshot.snapshot_id,
-            "f548332c-6026-4eff-8c1c-ba202cd5c834".parse().unwrap()
+            "f548332c-6026-4eff-8c1c-ba202cd5c834".parse::<Uuid>().unwrap()
         );
         assert_eq!(region_snapshot.deleting, false);
 

diff --git a/nexus/tests/integration_tests/oximeter.rs b/nexus/tests/integration_tests/oximeter.rs
@@ -35,13 +35,13 @@ async fn test_oximeter_database_records(context: &ControlPlaneTestContext) {
     let actual_id = result[0].get::<&str, Uuid>("id");
     assert_eq!(
         actual_id,
-        nexus_test_utils::OXIMETER_UUID.parse().unwrap(),
+        nexus_test_utils::OXIMETER_UUID.parse::<Uuid>().unwrap(),
         "Oximeter ID does not match the ID returned from the database"
     );
 
     // Kind of silly, but let's wait until the producer is actually registered
     // with Oximeter.
-    let producer_id = nexus_test_utils::PRODUCER_UUID.parse().unwrap();
+    let producer_id: Uuid = nexus_test_utils::PRODUCER_UUID.parse().unwrap();
     wait_for_producer(&context.oximeter, producer_id).await;
 
     // Verify that the producer lives in the DB.
@@ -66,7 +66,7 @@ async fn test_oximeter_database_records(context: &ControlPlaneTestContext) {
         .expect("The database doesn't contain a record of our producer");
     assert_eq!(
         actual_oximeter_id,
-        nexus_test_utils::OXIMETER_UUID.parse().unwrap(),
+        nexus_test_utils::OXIMETER_UUID.parse::<Uuid>().unwrap(),
         "Producer's oximeter ID returned from the database does not match the expected ID"
     );
 }

diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
@@ -131,7 +131,7 @@ unicode-bidi = { version = "0.3.17" }
 unicode-normalization = { version = "0.1.24" }
 usdt = { version = "0.5.0" }
 usdt-impl = { version = "0.5.0", default-features = false, features = ["asm", "des"] }
-uuid = { version = "1.11.0", features = ["serde", "v4"] }
+uuid = { version = "1.12.0", features = ["serde", "v4"] }
 x509-cert = { version = "0.2.5" }
 zerocopy = { version = "0.7.35", features = ["derive", "simd"] }
 zeroize = { version = "1.8.1", features = ["std", "zeroize_derive"] }
@@ -255,7 +255,7 @@ unicode-normalization = { version = "0.1.24" }
 unicode-xid = { version = "0.2.6" }
 usdt = { version = "0.5.0" }
 usdt-impl = { version = "0.5.0", default-features = false, features = ["asm", "des"] }
-uuid = { version = "1.11.0", features = ["serde", "v4"] }
+uuid = { version = "1.12.0", features = ["serde", "v4"] }
 x509-cert = { version = "0.2.5" }
 zerocopy = { version = "0.7.35", features = ["derive", "simd"] }
 zeroize = { version = "1.8.1", features = ["std", "zeroize_derive"] }