From d734c4f54b48a308e8183852f95678e563da6809 Mon Sep 17 00:00:00 2001 From: dirreke Date: Sun, 13 Aug 2023 15:56:30 +0800 Subject: [PATCH] Upgrade hashbrown,gimli and object --- Cargo.lock | 106 ++++++++++++++++++++---------------------- thorin-bin/Cargo.toml | 2 +- thorin/Cargo.toml | 6 +-- 3 files changed, 55 insertions(+), 59 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6fbe22c..c6c0ffb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,17 +8,6 @@ version = "1.0.2" source = "registry+/~https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - [[package]] name = "ahash" version = "0.8.3" @@ -30,6 +19,12 @@ dependencies = [ "version_check", ] +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -197,11 +192,17 @@ dependencies = [ "syn", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "fallible-iterator" -version = "0.2.0" +version = "0.3.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "flate2" @@ -213,22 +214,11 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - [[package]] name = "gimli" -version = "0.26.2" +version = "0.28.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" dependencies = [ "fallible-iterator", "indexmap", @@ -237,20 +227,12 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.3" -source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.6", -] - -[[package]] -name = "hashbrown" -version = "0.13.2" +version = "0.14.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" dependencies = [ - "ahash 0.8.3", + "ahash", + "allocator-api2", ] [[package]] @@ -297,12 +279,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.2" +version = "2.0.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ - "autocfg", - "hashbrown 0.12.3", + "equivalent", + "hashbrown", ] [[package]] @@ -404,13 +386,13 @@ dependencies = [ [[package]] name = "object" -version = "0.31.0" +version = "0.32.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "d08090140cfee2e09897d6be320b47a45b79eb68b414de87130f9532966e2f1d" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "crc32fast", "flate2", - "hashbrown 0.13.2", + "hashbrown", "indexmap", "memchr", "ruzstd", @@ -496,12 +478,12 @@ checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "ruzstd" -version = "0.3.1" +version = "0.4.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "9a15e661f0f9dac21f3494fe5d23a6338c0ac116a2d22c2b63010acd89467ffe" +checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc" dependencies = [ "byteorder", - "thiserror", + "thiserror-core", "twox-hash", ] @@ -629,6 +611,26 @@ dependencies = [ "thiserror-impl", ] +[[package]] +name = "thiserror-core" +version = "1.0.38" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "0d97345f6437bb2004cd58819d8a9ef8e36cdd7661c2abc4bbde0a7c40d9f497" +dependencies = [ + "thiserror-core-impl", +] + +[[package]] +name = "thiserror-core-impl" +version = "1.0.38" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "10ac1c5050e43014d16b2f94d0d2ce79e65ffdd8b38d8048f9c8f6a8a6da62ac" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "thiserror-impl" version = "1.0.38" @@ -645,7 +647,7 @@ name = "thorin-dwp" version = "0.6.0" dependencies = [ "gimli", - "hashbrown 0.12.3", + "hashbrown", "object", "tracing", ] @@ -817,12 +819,6 @@ version = "0.9.4" source = "registry+/~https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - [[package]] name = "wasm-bindgen" version = "0.2.84" diff --git a/thorin-bin/Cargo.toml b/thorin-bin/Cargo.toml index b961d6e..7637e4f 100644 --- a/thorin-bin/Cargo.toml +++ b/thorin-bin/Cargo.toml @@ -24,7 +24,7 @@ tracing-tree = "0.1.10" typed-arena = "2.0.1" [dependencies.object] -version = "0.31.0" +version = "0.32.0" default-features = false features = [ "archive", "read", "write", "compression" ] diff --git a/thorin/Cargo.toml b/thorin/Cargo.toml index 08d204f..5c62b4a 100644 --- a/thorin/Cargo.toml +++ b/thorin/Cargo.toml @@ -13,17 +13,17 @@ edition = "2021" [dependencies] tracing = "0.1.29" -hashbrown = "0.12.0" +hashbrown = "0.14.0" [dependencies.gimli] -version = "0.26.1" +version = "0.28.0" default-features = false # `gimli/std` pulls in `fallible-iterator` which we don't use, but can't opt out of, because of # cargo#8832. features = [ "read", "write", "std" ] [dependencies.object] -version = "0.31.0" +version = "0.32.0" default-features = false features = [ "archive", "read", "write", "compression" ]