mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #129860 - lqd:remove-duplicate-deps, r=alexcrichton

Browse Source 
update `object` dependency to remove duplicate `wasmparser`

``@alexcrichton`` in #129762 you bumped a few wasm-related dependencies and tried to avoid duplicates.

If I understand correctly, `object` 0.36.4 wasn't yet released at the time, and therefore #129762 ended up duplicating `wasmparser`. Now that the release happened, we can remove the duplicate.

r? ``@alexcrichton``
This commit is contained in:
Matthias Krüger 2024-09-03 06:05:41 +02:00 committed by GitHub
commit e9cd99670a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Cargo.lock
View File

@ -199,7 +199,7 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01667f6f40216b9a0b2945e05fed5f1ad0ab6470e69cb9378001e37b1c0668e4" checksum = "01667f6f40216b9a0b2945e05fed5f1ad0ab6470e69cb9378001e37b1c0668e4"
dependencies = [ dependencies = [
"object 0.36.3", "object 0.36.4",
] ]
[[package]] [[package]]
@ -2453,9 +2453,9 @@ dependencies = [
[[package]] [[package]]
name = "object" name = "object"
version = "0.36.3" version = "0.36.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
dependencies = [ dependencies = [
"crc32fast", "crc32fast",
"flate2", "flate2",
@ -2463,7 +2463,7 @@ dependencies = [
"indexmap", "indexmap",
"memchr", "memchr",
"ruzstd 0.7.0", "ruzstd 0.7.0",
"wasmparser 0.215.0", "wasmparser",
] ]
[[package]] [[package]]
@ -3129,11 +3129,11 @@ dependencies = [
"build_helper", "build_helper",
"gimli 0.31.0", "gimli 0.31.0",
"libc", "libc",
"object 0.36.3", "object 0.36.4",
"regex", "regex",
"serde_json", "serde_json",
"similar", "similar",
"wasmparser 0.216.0", "wasmparser",
] ]
[[package]] [[package]]
@ -3408,7 +3408,7 @@ dependencies = [
"itertools", "itertools",
"libc", "libc",
"measureme", "measureme",
"object 0.36.3", "object 0.36.4",
"rustc-demangle", "rustc-demangle",
"rustc_ast", "rustc_ast",
"rustc_attr", "rustc_attr",
@ -3447,7 +3447,7 @@ dependencies = [
"itertools", "itertools",
"jobserver", "jobserver",
"libc", "libc",
"object 0.36.3", "object 0.36.4",
"pathdiff", "pathdiff",
"regex", "regex",
"rustc_arena", "rustc_arena",
@ -4431,7 +4431,7 @@ name = "rustc_target"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"object 0.36.3", "object 0.36.4",
"rustc_abi", "rustc_abi",
"rustc_data_structures", "rustc_data_structures",
"rustc_feature", "rustc_feature",
@ -5849,7 +5849,7 @@ dependencies = [
"lexopt", "lexopt",
"tempfile", "tempfile",
"wasi-preview1-component-adapter-provider", "wasi-preview1-component-adapter-provider",
"wasmparser 0.216.0", "wasmparser",
"wat", "wat",
"wit-component", "wit-component",
"wit-parser", "wit-parser",
@ -5869,7 +5869,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04c23aebea22c8a75833ae08ed31ccc020835b12a41999e58c31464271b94a88" checksum = "04c23aebea22c8a75833ae08ed31ccc020835b12a41999e58c31464271b94a88"
dependencies = [ dependencies = [
"leb128", "leb128",
"wasmparser 0.216.0", "wasmparser",
] ]
[[package]] [[package]]
@ -5885,16 +5885,7 @@ dependencies = [
"serde_json", "serde_json",
"spdx", "spdx",
"wasm-encoder", "wasm-encoder",
"wasmparser 0.216.0", "wasmparser",
]
[[package]]
name = "wasmparser"
version = "0.215.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53fbde0881f24199b81cf49b6ff8f9c145ac8eb1b7fc439adb5c099734f7d90e"
dependencies = [
"bitflags 2.6.0",
] ]
[[package]] [[package]]
@ -6228,7 +6219,7 @@ dependencies = [
"serde_json", "serde_json",
"wasm-encoder", "wasm-encoder",
"wasm-metadata", "wasm-metadata",
"wasmparser 0.216.0", "wasmparser",
"wit-parser", "wit-parser",
] ]
@ -6247,7 +6238,7 @@ dependencies = [
"serde_derive", "serde_derive",
"serde_json", "serde_json",
"unicode-xid", "unicode-xid",
"wasmparser 0.216.0", "wasmparser",
] ]
[[package]] [[package]]