From 720a012c7353a0c20e97fc47660197dd54b80bae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2025 11:34:03 +0000 Subject: [PATCH 1/2] Bump uuid from 1.11.0 to 1.12.0 Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.11.0 to 1.12.0. - [Release notes](https://github.com/uuid-rs/uuid/releases) - [Commits](https://github.com/uuid-rs/uuid/compare/1.11.0...1.12.0) --- updated-dependencies: - dependency-name: uuid dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1570eb137..6c021139b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3102,9 +3102,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" +checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4" dependencies = [ "getrandom", "serde", diff --git a/Cargo.toml b/Cargo.toml index e5695dd26..1a692bcdf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -59,7 +59,7 @@ strum_macros = "0.26" tokio = { version = "1", features = ["rt-multi-thread"], optional = true } thiserror = "2.0" ureq = { version = "^2.12.0", features = ["tls"], optional = true } -uuid = { version = "^1.11.0", features = ["serde", "v4"] } +uuid = { version = "^1.12.0", features = ["serde", "v4"] } url = { version = "2", optional = true } [dev-dependencies] From a3fce05152dabfb86463f8b1f446c9cad7f1ed0b Mon Sep 17 00:00:00 2001 From: "Dustin J. Mitchell" Date: Thu, 16 Jan 2025 07:00:52 -0500 Subject: [PATCH 2/2] Update for breaking change in uuid --- src/server/cloud/server.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/server/cloud/server.rs b/src/server/cloud/server.rs index 36d6e476b..0b5aef692 100644 --- a/src/server/cloud/server.rs +++ b/src/server/cloud/server.rs @@ -803,7 +803,7 @@ mod tests { #[test] fn get_child_versions_empty() { let mut server = make_server(); - assert_eq!(server.get_child_versions(&Uuid::new_v4()).unwrap(), vec![]); + assert_eq!(server.get_child_versions(&Uuid::new_v4()).unwrap().len(), 0); } #[test] @@ -811,7 +811,7 @@ mod tests { let mut server = make_server(); let (v1, v2) = (Uuid::new_v4(), Uuid::new_v4()); server.mock_add_version(v2, v1, 1000, b"first"); - assert_eq!(server.get_child_versions(&v1).unwrap(), vec![]); + assert_eq!(server.get_child_versions(&v1).unwrap().len(), 0); assert_eq!(server.get_child_versions(&v2).unwrap(), vec![v1]); } @@ -821,8 +821,8 @@ mod tests { let (v1, v2, v3) = (Uuid::new_v4(), Uuid::new_v4(), Uuid::new_v4()); server.mock_add_version(v3, v1, 1000, b"first"); server.mock_add_version(v3, v2, 1000, b"second"); - assert_eq!(server.get_child_versions(&v1).unwrap(), vec![]); - assert_eq!(server.get_child_versions(&v2).unwrap(), vec![]); + assert_eq!(server.get_child_versions(&v1).unwrap().len(), 0); + assert_eq!(server.get_child_versions(&v2).unwrap().len(), 0); let versions = server.get_child_versions(&v3).unwrap(); assert!(versions == vec![v1, v2] || versions == vec![v2, v1]); }