about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2024-07-28 20:07:45 +0200
committerGitHub <noreply@github.com>2024-07-28 20:07:45 +0200
commit19feb90d69ff05979561f8329a99bc1f1e1f6508 (patch)
tree485d38dd9a21bef6aa2f82d39a5548ed6db30a11 /src
parent506a6317be988f315501c03b2a7cdaf6fcc49730 (diff)
parent87547103e8c35517399b3c1428c2d97469e42918 (diff)
downloadrust-19feb90d69ff05979561f8329a99bc1f1e1f6508.tar.gz
rust-19feb90d69ff05979561f8329a99bc1f1e1f6508.zip
Rollup merge of #127860 - klensy:dedup, r=Mark-Simulacrum
deps: dedup object, wasmparser, wasm-encoder

* dedups one `object`, additional dupe will be removed, with next `thorin-dwp` update
* `wasmparser` pinned to minor versions, so full merge isn't possible
* same with `wasm-encoder`

Turned off some features for `wasmparser` (see features https://github.com/bytecodealliance/wasm-tools/blob/v1.208.1/crates/wasmparser/Cargo.toml) in `run-make-support`, looks working?
Diffstat (limited to 'src')
-rw-r--r--src/tools/run-make-support/Cargo.toml4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/run-make-support/Cargo.toml b/src/tools/run-make-support/Cargo.toml
index b3913732839..c4d5446a248 100644
--- a/src/tools/run-make-support/Cargo.toml
+++ b/src/tools/run-make-support/Cargo.toml
@@ -5,9 +5,9 @@ edition = "2021"
 
 [dependencies]
 bstr = "1.6.0"
-object = "0.34.0"
+object = "0.36.2"
 similar = "2.5.0"
-wasmparser = "0.118.2"
+wasmparser = { version = "0.214", default-features = false, features = ["std"] }
 regex = "1.8" # 1.8 to avoid memchr 2.6.0, as 2.5.0 is pinned in the workspace
 gimli = "0.31.0"
 build_helper = { path = "../build_helper" }