Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Rust crate uuid to 1.12.0 #7070

Merged
merged 2 commits into from
Jan 17, 2025
Merged

Update Rust crate uuid to 1.12.0 #7070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9af14df
Update Rust crate uuid to 1.12.0
oxide-renovate[bot] Jan 17, 2025
1c7ecf4
fix newly-broken inferences
iliana Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion nexus/db-queries/src/db/datastore/volume.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions nexus/tests/integration_tests/oximeter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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"
);
}
Expand Down
4 changes: 2 additions & 2 deletions workspace-hack/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down Expand Up @@ -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"] }
Expand Down
Loading