Unverified Commit 88483bde authored by Luke Sandberg's avatar Luke Sandberg Committed by GitHub

Deduplicate the regress, wat/wasmparser and base64 dependencies (#97762)

### What?

Collapses three duplicated crate dependencies, so each is built once
instead of twice. **−150 KiB** of code

Manifests and `Cargo.lock` only — no source changes, and none were
needed.

**`regress` → 0.11.1** (−133 KiB, the bulk of the win)

**`wat` and `wasmparser` → the 239 family** (−13 KiB)

**`base64` → one workspace declaration on 0.22** (−1.2 KiB)
parent 75c1f1f6
...@@ -3181,8 +3181,6 @@ version = "0.15.4" ...@@ -3181,8 +3181,6 @@ version = "0.15.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
dependencies = [ dependencies = [
"allocator-api2",
"equivalent",
"foldhash 0.1.5", "foldhash 0.1.5",
"serde", "serde",
] ]
...@@ -4973,7 +4971,7 @@ dependencies = [ ...@@ -4973,7 +4971,7 @@ dependencies = [
"allsorts", "allsorts",
"anyhow", "anyhow",
"async-trait", "async-trait",
"base64 0.21.4", "base64 0.22.1",
"bincode 2.0.1", "bincode 2.0.1",
"either", "either",
"futures", "futures",
...@@ -4990,7 +4988,7 @@ dependencies = [ ...@@ -4990,7 +4988,7 @@ dependencies = [
"qstring", "qstring",
"react_remove_properties", "react_remove_properties",
"regex", "regex",
"regress 0.10.4", "regress",
"remove_console", "remove_console",
"rustc-hash 2.1.1", "rustc-hash 2.1.1",
"serde", "serde",
...@@ -5033,7 +5031,7 @@ name = "next-custom-transforms" ...@@ -5033,7 +5031,7 @@ name = "next-custom-transforms"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64 0.21.4", "base64 0.22.1",
"bytes-str", "bytes-str",
"chrono", "chrono",
"easy-error", "easy-error",
...@@ -6596,16 +6594,6 @@ dependencies = [ ...@@ -6596,16 +6594,6 @@ dependencies = [
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
[[package]]
name = "regress"
version = "0.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "145bb27393fe455dd64d6cbc8d059adfa392590a45eadf079c01b11857e7b010"
dependencies = [
"hashbrown 0.15.4",
"memchr",
]
[[package]] [[package]]
name = "regress" name = "regress"
version = "0.11.1" version = "0.11.1"
...@@ -7966,7 +7954,7 @@ dependencies = [ ...@@ -7966,7 +7954,7 @@ dependencies = [
"indexmap 2.14.0", "indexmap 2.14.0",
"once_cell", "once_cell",
"regex", "regex",
"regress 0.11.1", "regress",
"rustc-hash 2.1.1", "rustc-hash 2.1.1",
"serde", "serde",
"serde_json", "serde_json",
...@@ -9983,7 +9971,7 @@ dependencies = [ ...@@ -9983,7 +9971,7 @@ dependencies = [
"anyhow", "anyhow",
"bincode 2.0.1", "bincode 2.0.1",
"regex", "regex",
"regress 0.10.4", "regress",
"turbo-tasks", "turbo-tasks",
] ]
...@@ -10772,7 +10760,7 @@ version = "0.1.0" ...@@ -10772,7 +10760,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
"base64 0.21.4", "base64 0.22.1",
"bincode 2.0.1", "bincode 2.0.1",
"image", "image",
"mime", "mime",
...@@ -10851,7 +10839,7 @@ dependencies = [ ...@@ -10851,7 +10839,7 @@ dependencies = [
"anyhow", "anyhow",
"async-stream", "async-stream",
"async-trait", "async-trait",
"base64 0.21.4", "base64 0.22.1",
"bincode 2.0.1", "bincode 2.0.1",
"bytes", "bytes",
"const_format", "const_format",
...@@ -11089,7 +11077,7 @@ dependencies = [ ...@@ -11089,7 +11077,7 @@ dependencies = [
"turbo-tasks-hash", "turbo-tasks-hash",
"turbopack-core", "turbopack-core",
"turbopack-ecmascript", "turbopack-ecmascript",
"wasmparser 0.235.0", "wasmparser 0.239.0",
"wat", "wat",
] ]
...@@ -12067,10 +12055,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ...@@ -12067,10 +12055,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "161296c618fa2d63f6ed5fffd1112937e803cb9ec71b32b01a76321555660917" checksum = "161296c618fa2d63f6ed5fffd1112937e803cb9ec71b32b01a76321555660917"
dependencies = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"hashbrown 0.15.4",
"indexmap 2.14.0", "indexmap 2.14.0",
"semver",
"serde",
] ]
[[package]] [[package]]
...@@ -12307,24 +12292,24 @@ dependencies = [ ...@@ -12307,24 +12292,24 @@ dependencies = [
[[package]] [[package]]
name = "wast" name = "wast"
version = "235.0.0" version = "239.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1eda4293f626c99021bb3a6fbe4fbbe90c0e31a5ace89b5f620af8925de72e13" checksum = "9139176fe8a2590e0fb174cdcaf373b224cb93c3dde08e4297c1361d2ba1ea5d"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"leb128fmt", "leb128fmt",
"memchr", "memchr",
"unicode-width 0.2.1", "unicode-width 0.2.1",
"wasm-encoder 0.235.0", "wasm-encoder 0.239.0",
] ]
[[package]] [[package]]
name = "wat" name = "wat"
version = "1.235.0" version = "1.239.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e777e0327115793cb96ab220b98f85327ec3d11f34ec9e8d723264522ef206aa" checksum = "3e1c941927d34709f255558166f8901a2005f8ab4a9650432e9281b7cc6f3b75"
dependencies = [ dependencies = [
"wast 235.0.0", "wast 239.0.0",
] ]
[[package]] [[package]]
......
...@@ -251,6 +251,7 @@ allsorts = { version = "0.14.0", default-features = false, features = [ ...@@ -251,6 +251,7 @@ allsorts = { version = "0.14.0", default-features = false, features = [
] } ] }
anyhow = "1.0.100" anyhow = "1.0.100"
async-trait = "0.1.64" async-trait = "0.1.64"
base64 = "0.22.1"
bincode = { version = "2.0.1", features = ["serde"] } bincode = { version = "2.0.1", features = ["serde"] }
bitfield = "0.19.4" bitfield = "0.19.4"
bumpalo = { version = "3.19.0", features = ["boxed", "collections", "allocator-api2"] } bumpalo = { version = "3.19.0", features = ["boxed", "collections", "allocator-api2"] }
...@@ -322,7 +323,7 @@ quote = "1.0.45" ...@@ -322,7 +323,7 @@ quote = "1.0.45"
rand = "0.10.1" rand = "0.10.1"
rayon = "1.10.0" rayon = "1.10.0"
regex = "1.12.3" regex = "1.12.3"
regress = "0.10.4" regress = "0.11.1"
reqwest = { version = "0.13.2", default-features = false } reqwest = { version = "0.13.2", default-features = false }
ringmap = "0.2.5" ringmap = "0.2.5"
roaring = "0.11.4" roaring = "0.11.4"
......
...@@ -14,7 +14,7 @@ workspace = true ...@@ -14,7 +14,7 @@ workspace = true
[dependencies] [dependencies]
anyhow = { workspace = true } anyhow = { workspace = true }
async-trait = { workspace = true } async-trait = { workspace = true }
base64 = "0.21.0" base64 = { workspace = true }
allsorts = { workspace = true } allsorts = { workspace = true }
bincode = { workspace = true } bincode = { workspace = true }
either = { workspace = true, features = ["serde"] } either = { workspace = true, features = ["serde"] }
......
...@@ -8,7 +8,7 @@ publish = false ...@@ -8,7 +8,7 @@ publish = false
workspace = true workspace = true
[dependencies] [dependencies]
base64 = "0.21.0" base64 = { workspace = true }
bytes-str = { workspace = true } bytes-str = { workspace = true }
chrono = "0.4" chrono = "0.4"
easy-error = "1.0.0" easy-error = "1.0.0"
......
...@@ -21,7 +21,7 @@ workspace = true ...@@ -21,7 +21,7 @@ workspace = true
[dependencies] [dependencies]
anyhow = { workspace = true } anyhow = { workspace = true }
async-trait = { workspace = true } async-trait = { workspace = true }
base64 = "0.21.0" base64 = { workspace = true }
bincode = { workspace = true } bincode = { workspace = true }
image = { workspace = true, default-features = false, features = [ image = { workspace = true, default-features = false, features = [
"gif", "gif",
......
...@@ -24,7 +24,7 @@ anyhow = { workspace = true } ...@@ -24,7 +24,7 @@ anyhow = { workspace = true }
async-stream = "0.3.4" async-stream = "0.3.4"
async-trait = { workspace = true } async-trait = { workspace = true }
dashmap = { workspace = true } dashmap = { workspace = true }
base64 = "0.21.0" base64 = { workspace = true }
bincode = { workspace = true } bincode = { workspace = true }
bytes = { workspace = true } bytes = { workspace = true }
const_format = { workspace = true } const_format = { workspace = true }
......
...@@ -23,6 +23,10 @@ turbo-tasks-fs = { workspace = true } ...@@ -23,6 +23,10 @@ turbo-tasks-fs = { workspace = true }
turbo-tasks-hash = { workspace = true } turbo-tasks-hash = { workspace = true }
turbopack-core = { workspace = true } turbopack-core = { workspace = true }
turbopack-ecmascript = { workspace = true } turbopack-ecmascript = { workspace = true }
wasmparser = "0.235.0" # `wat` and `wasmparser` version in lockstep: `wat` pulls `wast`, which depends on a
wat = "1.0.69" # `wasm-encoder` that in turn pins a `wasmparser`. Keeping both on the 239 family lets that
# `wasmparser` be the same one wasmtime already links, so only one copy is built. Bumping either
# without the other, or letting `wat` float to a newer minor, reintroduces the duplicate.
wasmparser = "0.239.0"
wat = "=1.239.0"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment