From cb3ad2ff5af92111ddf9504de8dbd23491dd3880 Mon Sep 17 00:00:00 2001 From: David Edey Date: Tue, 14 Jan 2025 13:51:57 +0000 Subject: [PATCH] tweak: Update indexmap to use newer hashbrown too --- Cargo.lock | 22 +++++++++---------- Cargo.toml | 2 +- examples/everything/Cargo.lock | 20 +++++++++++------ examples/hello-world/Cargo.lock | 20 +++++++++++------ examples/no-std/Cargo.lock | 14 ++++-------- .../assets/template/Cargo.lock_template | 20 +++++++++++------ radix-clis/tests/blueprints/Cargo.lock | 8 +++---- .../assets/blueprints/Cargo.lock | 8 +++---- .../tests/assets/call_indirect/Cargo.lock | 4 ++-- .../tests/assets/scenario_1/Cargo.lock | 8 +++---- scrypto-test/tests/blueprints/Cargo.lock | 14 ++++-------- 11 files changed, 73 insertions(+), 67 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8cf5390921..b8f3dcea5c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1466,13 +1466,13 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "arbitrary", "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.15.2", "serde", ] @@ -1494,7 +1494,7 @@ dependencies = [ "crossbeam-utils", "dashmap", "env_logger", - "indexmap 2.2.6", + "indexmap 2.7.0", "is-terminal", "itoa", "log", @@ -2475,7 +2475,7 @@ name = "radix-rust" version = "1.4.0-dev" dependencies = [ "hashbrown 0.15.2", - "indexmap 2.2.6", + "indexmap 2.7.0", "serde", ] @@ -2854,7 +2854,7 @@ name = "sbor-derive-common" version = "1.4.0-dev" dependencies = [ "const-sha1", - "indexmap 2.2.6", + "indexmap 2.7.0", "itertools", "proc-macro2", "quote", @@ -3068,7 +3068,7 @@ version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.7.0", "itoa", "memchr", "ryu", @@ -3094,7 +3094,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.2.6", + "indexmap 2.7.0", "serde", "serde_derive", "serde_json", @@ -3488,7 +3488,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.7.0", "serde", "serde_spanned", "toml_datetime", @@ -3501,7 +3501,7 @@ version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.7.0", "serde", "serde_spanned", "toml_datetime", @@ -3818,7 +3818,7 @@ version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad71036aada3f6b09251546e97e4f4f176dd6b41cf6fa55e7e0f65e86aec319a" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.7.0", "semver", ] diff --git a/Cargo.toml b/Cargo.toml index bdba2a3027..c7737a4bae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -93,7 +93,7 @@ flume = { version = "0.11.0" } # Used in radix-clis for multi-threaded channels fslock = { version = "0.2.1" } hashbrown = { version = "0.15.1" } hex = { version = "0.4.3", default-features = false } -indexmap = { version = "2.2.5", default-features = false } +indexmap = { version = "2.7.0", default-features = false } inferno = { version = "0.11.19" } itertools = { version = "0.10.3" } lazy_static = { version = "1.4.0" } diff --git a/examples/everything/Cargo.lock b/examples/everything/Cargo.lock index 02e8dcc097..43529b8aff 100644 --- a/examples/everything/Cargo.lock +++ b/examples/everything/Cargo.lock @@ -503,6 +503,12 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" + [[package]] name = "heck" version = "0.4.1" @@ -536,12 +542,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.15.2", "serde", ] @@ -968,7 +974,7 @@ dependencies = [ name = "radix-rust" version = "1.4.0-dev" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.7.0", "serde", ] @@ -1164,7 +1170,7 @@ name = "sbor-derive-common" version = "1.4.0-dev" dependencies = [ "const-sha1", - "indexmap 2.2.6", + "indexmap 2.7.0", "itertools", "proc-macro2", "quote", @@ -1547,7 +1553,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.7.0", "serde", "serde_spanned", "toml_datetime", @@ -1750,7 +1756,7 @@ version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad71036aada3f6b09251546e97e4f4f176dd6b41cf6fa55e7e0f65e86aec319a" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.7.0", "semver", ] diff --git a/examples/hello-world/Cargo.lock b/examples/hello-world/Cargo.lock index ca49cce475..07af087f44 100644 --- a/examples/hello-world/Cargo.lock +++ b/examples/hello-world/Cargo.lock @@ -495,6 +495,12 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" + [[package]] name = "heck" version = "0.4.1" @@ -536,12 +542,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.15.2", "serde", ] @@ -968,7 +974,7 @@ dependencies = [ name = "radix-rust" version = "1.4.0-dev" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.7.0", "serde", ] @@ -1164,7 +1170,7 @@ name = "sbor-derive-common" version = "1.4.0-dev" dependencies = [ "const-sha1", - "indexmap 2.2.6", + "indexmap 2.7.0", "itertools", "proc-macro2", "quote", @@ -1547,7 +1553,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.7.0", "serde", "serde_spanned", "toml_datetime", @@ -1750,7 +1756,7 @@ version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad71036aada3f6b09251546e97e4f4f176dd6b41cf6fa55e7e0f65e86aec319a" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.7.0", "semver", ] diff --git a/examples/no-std/Cargo.lock b/examples/no-std/Cargo.lock index e7186dad4f..b0e58bab93 100644 --- a/examples/no-std/Cargo.lock +++ b/examples/no-std/Cargo.lock @@ -236,12 +236,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" - [[package]] name = "hashbrown" version = "0.15.2" @@ -276,12 +270,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown", "serde", ] @@ -489,7 +483,7 @@ dependencies = [ name = "radix-rust" version = "1.4.0-dev" dependencies = [ - "hashbrown 0.15.2", + "hashbrown", "indexmap", "serde", ] diff --git a/radix-clis/assets/template/Cargo.lock_template b/radix-clis/assets/template/Cargo.lock_template index ba94dc1776..4a04851d5b 100644 --- a/radix-clis/assets/template/Cargo.lock_template +++ b/radix-clis/assets/template/Cargo.lock_template @@ -495,6 +495,12 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" + [[package]] name = "heck" version = "0.4.1" @@ -528,12 +534,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.15.2", "serde", ] @@ -960,7 +966,7 @@ dependencies = [ name = "radix-rust" version = "1.4.0-dev" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.7.0", "serde", ] @@ -1156,7 +1162,7 @@ name = "sbor-derive-common" version = "1.4.0-dev" dependencies = [ "const-sha1", - "indexmap 2.2.6", + "indexmap 2.7.0", "itertools", "proc-macro2", "quote", @@ -1539,7 +1545,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.7.0", "serde", "serde_spanned", "toml_datetime", @@ -1742,7 +1748,7 @@ version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad71036aada3f6b09251546e97e4f4f176dd6b41cf6fa55e7e0f65e86aec319a" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.7.0", "semver", ] diff --git a/radix-clis/tests/blueprints/Cargo.lock b/radix-clis/tests/blueprints/Cargo.lock index c715823bf3..82f3ef4dc7 100644 --- a/radix-clis/tests/blueprints/Cargo.lock +++ b/radix-clis/tests/blueprints/Cargo.lock @@ -238,9 +238,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] name = "heck" @@ -265,9 +265,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", "hashbrown", diff --git a/radix-engine-tests/assets/blueprints/Cargo.lock b/radix-engine-tests/assets/blueprints/Cargo.lock index 194a1a693e..e89649ee39 100644 --- a/radix-engine-tests/assets/blueprints/Cargo.lock +++ b/radix-engine-tests/assets/blueprints/Cargo.lock @@ -454,9 +454,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] name = "heck" @@ -488,9 +488,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", "hashbrown", diff --git a/scrypto-compiler/tests/assets/call_indirect/Cargo.lock b/scrypto-compiler/tests/assets/call_indirect/Cargo.lock index c7dc55cb66..c14298a9fc 100644 --- a/scrypto-compiler/tests/assets/call_indirect/Cargo.lock +++ b/scrypto-compiler/tests/assets/call_indirect/Cargo.lock @@ -266,9 +266,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", "hashbrown", diff --git a/scrypto-compiler/tests/assets/scenario_1/Cargo.lock b/scrypto-compiler/tests/assets/scenario_1/Cargo.lock index 406ed68d14..8424b15b9f 100644 --- a/scrypto-compiler/tests/assets/scenario_1/Cargo.lock +++ b/scrypto-compiler/tests/assets/scenario_1/Cargo.lock @@ -231,9 +231,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] name = "heck" @@ -258,9 +258,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", "hashbrown", diff --git a/scrypto-test/tests/blueprints/Cargo.lock b/scrypto-test/tests/blueprints/Cargo.lock index 4eae36a924..3b0129084b 100644 --- a/scrypto-test/tests/blueprints/Cargo.lock +++ b/scrypto-test/tests/blueprints/Cargo.lock @@ -241,12 +241,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" - [[package]] name = "hashbrown" version = "0.15.2" @@ -281,12 +275,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown", "serde", ] @@ -479,7 +473,7 @@ dependencies = [ name = "radix-rust" version = "1.4.0-dev" dependencies = [ - "hashbrown 0.15.2", + "hashbrown", "indexmap", "serde", ]