From 150b6c4d752aac1ddd8a58734fadb318e02827cf Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Tue, 25 Nov 2025 23:13:46 +0100 Subject: [PATCH 1/3] Upgrade hashbrown, indexmap --- Cargo.lock | 12 ++++++------ consumer/Cargo.toml | 2 +- platforms/macos/Cargo.toml | 2 +- platforms/windows/Cargo.toml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 85922cd8..281a0305 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -713,9 +713,9 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "foldhash" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" +checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" [[package]] name = "foreign-types" @@ -841,9 +841,9 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "hashbrown" -version = "0.15.2" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" dependencies = [ "foldhash", ] @@ -868,9 +868,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "indexmap" -version = "2.6.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" dependencies = [ "equivalent", "hashbrown", diff --git a/consumer/Cargo.toml b/consumer/Cargo.toml index 6a3a9b15..2dc0c717 100644 --- a/consumer/Cargo.toml +++ b/consumer/Cargo.toml @@ -13,4 +13,4 @@ rust-version.workspace = true [dependencies] accesskit = { version = "0.21.1", path = "../common" } -hashbrown = { version = "0.15", default-features = false, features = ["default-hasher"] } +hashbrown = { version = "0.16", default-features = false, features = ["default-hasher"] } diff --git a/platforms/macos/Cargo.toml b/platforms/macos/Cargo.toml index db44098a..9e585364 100644 --- a/platforms/macos/Cargo.toml +++ b/platforms/macos/Cargo.toml @@ -17,7 +17,7 @@ default-target = "x86_64-apple-darwin" [dependencies] accesskit = { version = "0.21.1", path = "../../common" } accesskit_consumer = { version = "0.31.0", path = "../../consumer" } -hashbrown = { version = "0.15", default-features = false, features = ["default-hasher"] } +hashbrown = { version = "0.16", default-features = false, features = ["default-hasher"] } objc2 = "0.5.1" objc2-foundation = { version = "0.2.0", features = [ "NSArray", diff --git a/platforms/windows/Cargo.toml b/platforms/windows/Cargo.toml index d48aeec6..7c310a19 100644 --- a/platforms/windows/Cargo.toml +++ b/platforms/windows/Cargo.toml @@ -18,7 +18,7 @@ targets = [] [dependencies] accesskit = { version = "0.21.1", path = "../../common" } accesskit_consumer = { version = "0.31.0", path = "../../consumer" } -hashbrown = { version = "0.15", default-features = false, features = ["default-hasher"] } +hashbrown = { version = "0.16", default-features = false, features = ["default-hasher"] } static_assertions = "1.1.0" windows-core = "0.61.0" From 06e41ba1c63a1ef013bf73d58071137b5bb74915 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Thu, 27 Nov 2025 22:34:19 +0100 Subject: [PATCH 2/3] Move hashbrown dependency details to workspace.dependencies --- Cargo.toml | 3 +++ consumer/Cargo.toml | 2 +- platforms/macos/Cargo.toml | 2 +- platforms/windows/Cargo.toml | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 79b96678..52e5065d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,6 +24,9 @@ license = "MIT OR Apache-2.0" repository = "https://github.com/AccessKit/accesskit" rust-version = "1.77.2" +[workspace.dependencies] +hashbrown = { version = "0.16", default-features = false, features = ["default-hasher"] } + [profile.release] lto = true opt-level = "z" diff --git a/consumer/Cargo.toml b/consumer/Cargo.toml index 2dc0c717..4e74a276 100644 --- a/consumer/Cargo.toml +++ b/consumer/Cargo.toml @@ -13,4 +13,4 @@ rust-version.workspace = true [dependencies] accesskit = { version = "0.21.1", path = "../common" } -hashbrown = { version = "0.16", default-features = false, features = ["default-hasher"] } +hashbrown.workspace = true diff --git a/platforms/macos/Cargo.toml b/platforms/macos/Cargo.toml index 9e585364..e0fa5ef7 100644 --- a/platforms/macos/Cargo.toml +++ b/platforms/macos/Cargo.toml @@ -17,7 +17,7 @@ default-target = "x86_64-apple-darwin" [dependencies] accesskit = { version = "0.21.1", path = "../../common" } accesskit_consumer = { version = "0.31.0", path = "../../consumer" } -hashbrown = { version = "0.16", default-features = false, features = ["default-hasher"] } +hashbrown.workspace = true objc2 = "0.5.1" objc2-foundation = { version = "0.2.0", features = [ "NSArray", diff --git a/platforms/windows/Cargo.toml b/platforms/windows/Cargo.toml index 7c310a19..2f1e2f2a 100644 --- a/platforms/windows/Cargo.toml +++ b/platforms/windows/Cargo.toml @@ -18,7 +18,7 @@ targets = [] [dependencies] accesskit = { version = "0.21.1", path = "../../common" } accesskit_consumer = { version = "0.31.0", path = "../../consumer" } -hashbrown = { version = "0.16", default-features = false, features = ["default-hasher"] } +hashbrown.workspace = true static_assertions = "1.1.0" windows-core = "0.61.0" From 105b7a0a6747f717a7655caeef2da5bc6eda7165 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Thu, 27 Nov 2025 22:39:52 +0100 Subject: [PATCH 3/3] Downgrade indexmap in Cargo.lock MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … to fit the current MSRV. --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 281a0305..e9e07013 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -868,9 +868,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "indexmap" -version = "2.12.1" +version = "2.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" +checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5" dependencies = [ "equivalent", "hashbrown",