From cb150d37ce60f7b67b1dec39aebbf3f6af211084 Mon Sep 17 00:00:00 2001 From: Alphyr <47725341+a1phyr@users.noreply.github.com> Date: Tue, 14 Feb 2023 20:45:15 +0100 Subject: [PATCH] Update dependencies (#5513) --- Cargo.lock | 63 +++++++++++++++++---------- Cargo.toml | 6 +-- cranelift/codegen/Cargo.toml | 2 +- crates/environ/fuzz/Cargo.toml | 2 +- crates/jit/Cargo.toml | 2 +- crates/runtime/Cargo.toml | 2 +- crates/wiggle/test-helpers/Cargo.toml | 2 +- deny.toml | 4 ++ 8 files changed, 51 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b242db007a..1f2c64dbde 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ "gimli", ] @@ -54,11 +54,11 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.6" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "bf6ccdb167abbf410dcb915cabd428929d7f6a04980b54a11f26a39f1c7f7107" dependencies = [ - "getrandom 0.2.6", + "cfg-if", "once_cell", "version_check", ] @@ -138,9 +138,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" dependencies = [ "addr2line", "cc", @@ -558,7 +558,7 @@ dependencies = [ "cranelift-isle", "criterion", "gimli", - "hashbrown", + "hashbrown 0.13.1", "log", "regalloc2", "serde", @@ -620,7 +620,7 @@ name = "cranelift-frontend" version = "0.94.0" dependencies = [ "cranelift-codegen", - "hashbrown", + "hashbrown 0.13.1", "log", "similar", "smallvec", @@ -687,7 +687,7 @@ version = "0.94.0" dependencies = [ "anyhow", "cranelift-codegen", - "hashbrown", + "hashbrown 0.13.1", ] [[package]] @@ -776,7 +776,7 @@ dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", - "hashbrown", + "hashbrown 0.13.1", "itertools", "log", "serde", @@ -862,7 +862,7 @@ dependencies = [ "autocfg 1.1.0", "cfg-if", "crossbeam-utils", - "memoffset", + "memoffset 0.6.5", "once_cell", "scopeguard", ] @@ -1361,9 +1361,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.26.1" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" +checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793" dependencies = [ "fallible-iterator", "indexmap", @@ -1398,6 +1398,12 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038" dependencies = [ "ahash", ] @@ -1481,7 +1487,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg 1.1.0", - "hashbrown", + "hashbrown 0.12.3", "serde", ] @@ -1773,10 +1779,19 @@ dependencies = [ ] [[package]] -name = "miniz_oxide" -version = "0.5.1" +name = "memoffset" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +dependencies = [ + "autocfg 1.1.0", +] + +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" dependencies = [ "adler", ] @@ -1881,12 +1896,12 @@ checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" [[package]] name = "object" -version = "0.29.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +checksum = "8d864c91689fdc196779b98dba0aceac6118594c2df6ee5d943eb6a8df4d107a" dependencies = [ "crc32fast", - "hashbrown", + "hashbrown 0.13.1", "indexmap", "memchr", ] @@ -1922,9 +1937,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.12.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "oorandom" @@ -3721,7 +3736,7 @@ dependencies = [ "log", "mach", "memfd", - "memoffset", + "memoffset 0.8.0", "once_cell", "paste", "rand 0.8.5", diff --git a/Cargo.toml b/Cargo.toml index 715a80e47a..9f66f48744 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -174,10 +174,10 @@ windows-sys = "0.45.0" env_logger = "0.9" rustix = "0.36.7" log = { version = "0.4.8", default-features = false } -object = { version = "0.29", default-features = false, features = ['read_core', 'elf', 'std'] } -gimli = { version = "0.26.0", default-features = false, features = ['read', 'std'] } +object = { version = "0.30.1", default-features = false, features = ['read_core', 'elf', 'std'] } +gimli = { version = "0.27.0", default-features = false, features = ['read', 'std'] } clap = { version = "3.2.0", features = ["color", "suggestions", "derive"] } -hashbrown = "0.12" +hashbrown = "0.13" cap-std = "1.0.0" cap-rand = "1.0.0" capstone = "0.9.0" diff --git a/cranelift/codegen/Cargo.toml b/cranelift/codegen/Cargo.toml index deae0cb782..19a87930e9 100644 --- a/cranelift/codegen/Cargo.toml +++ b/cranelift/codegen/Cargo.toml @@ -18,7 +18,7 @@ bumpalo = "3" cranelift-codegen-shared = { path = "./shared", version = "0.94.0" } cranelift-entity = { workspace = true } cranelift-bforest = { workspace = true } -hashbrown = { workspace = true } +hashbrown = { workspace = true, features = ["raw"] } target-lexicon = { workspace = true } log = { workspace = true } serde = { version = "1.0.94", features = ["derive"], optional = true } diff --git a/crates/environ/fuzz/Cargo.toml b/crates/environ/fuzz/Cargo.toml index cacfcf69bd..9f7de28cf0 100644 --- a/crates/environ/fuzz/Cargo.toml +++ b/crates/environ/fuzz/Cargo.toml @@ -10,7 +10,7 @@ cargo-fuzz = true [dependencies] arbitrary = { version = "1.1.0", features = ["derive"] } -env_logger = "0.9.0" +env_logger = { workspace = true } libfuzzer-sys = "0.4" wasmparser = { workspace = true } wasmprinter = { workspace = true } diff --git a/crates/jit/Cargo.toml b/crates/jit/Cargo.toml index 8529392840..45f63558ec 100644 --- a/crates/jit/Cargo.toml +++ b/crates/jit/Cargo.toml @@ -20,7 +20,7 @@ cfg-if = "1.0" gimli = { workspace = true } object = { workspace = true } serde = { version = "1.0.94", features = ["derive"] } -addr2line = { version = "0.17.0", default-features = false } +addr2line = { version = "0.19.0", default-features = false } bincode = "1.2.1" rustc-demangle = "0.1.16" cpp_demangle = "0.3.2" diff --git a/crates/runtime/Cargo.toml b/crates/runtime/Cargo.toml index 5bf5a26684..053797c02c 100644 --- a/crates/runtime/Cargo.toml +++ b/crates/runtime/Cargo.toml @@ -17,7 +17,7 @@ wasmtime-fiber = { workspace = true, optional = true } wasmtime-jit-debug = { workspace = true, features = ["gdb_jit_int"] } libc = { version = "0.2.112", default-features = false } log = { workspace = true } -memoffset = "0.6.0" +memoffset = "0.8.0" indexmap = "1.0.2" cfg-if = "1.0" rand = { version = "0.8.3", features = ['small_rng'] } diff --git a/crates/wiggle/test-helpers/Cargo.toml b/crates/wiggle/test-helpers/Cargo.toml index 52fccd2434..ba4f45161a 100644 --- a/crates/wiggle/test-helpers/Cargo.toml +++ b/crates/wiggle/test-helpers/Cargo.toml @@ -20,7 +20,7 @@ anyhow = { workspace = true } thiserror = { workspace = true } tracing = { workspace = true } tracing-subscriber = { version = "0.3.1", default-features = false, features = ['fmt'] } -env_logger = "0.9" +env_logger = { workspace = true } [badges] maintenance = { status = "actively-developed" } diff --git a/deny.toml b/deny.toml index ee47bb543e..2c1ea435b6 100644 --- a/deny.toml +++ b/deny.toml @@ -39,4 +39,8 @@ skip-tree = [ # This is somewhat unmaintained at this point and seems to pull in an old # version of `env_logger`, so ignore it. { name = "pretty_env_logger", depth = 20 }, + + # They want to publish version 2.0 to upgrade `hashbrown` so in the meantime + # it is duplicated for us. + { name = "indexmap", depth = 2 }, ]