Skip to content

Commit a37fefd

Browse files
Merge remote-tracking branch 'upstream/canary' into pr-86418
2 parents 3eb63cf + 7c7db13 commit a37fefd

File tree

554 files changed

+21868
-16006
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

554 files changed

+21868
-16006
lines changed

Cargo.lock

Lines changed: 25 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -294,13 +294,12 @@ next-taskless = { path = "crates/next-taskless" }
294294
# Turbopack
295295
auto-hash-map = { path = "turbopack/crates/turbo-tasks-auto-hash-map" }
296296
turbo-bincode = { path = "turbopack/crates/turbo-bincode" }
297-
turbo-prehash = { path = "turbopack/crates/turbo-prehash" }
298-
turbo-rcstr = { path = "turbopack/crates/turbo-rcstr" }
299297
turbo-dyn-eq-hash = { path = "turbopack/crates/turbo-dyn-eq-hash" }
300298
turbo-esregex = { path = "turbopack/crates/turbo-esregex" }
299+
turbo-frozenmap = { path = "turbopack/crates/turbo-frozenmap" }
301300
turbo-persistence = { path = "turbopack/crates/turbo-persistence" }
302-
turbo-unix-path = { path = "turbopack/crates/turbo-unix-path" }
303-
turbo-tasks-malloc = { path = "turbopack/crates/turbo-tasks-malloc", default-features = false }
301+
turbo-prehash = { path = "turbopack/crates/turbo-prehash" }
302+
turbo-rcstr = { path = "turbopack/crates/turbo-rcstr" }
304303
turbo-tasks = { path = "turbopack/crates/turbo-tasks" }
305304
turbo-tasks-backend = { path = "turbopack/crates/turbo-tasks-backend" }
306305
turbo-tasks-bytes = { path = "turbopack/crates/turbo-tasks-bytes" }
@@ -309,7 +308,9 @@ turbo-tasks-fetch = { path = "turbopack/crates/turbo-tasks-fetch" }
309308
turbo-tasks-fs = { path = "turbopack/crates/turbo-tasks-fs" }
310309
turbo-tasks-hash = { path = "turbopack/crates/turbo-tasks-hash" }
311310
turbo-tasks-macros = { path = "turbopack/crates/turbo-tasks-macros" }
311+
turbo-tasks-malloc = { path = "turbopack/crates/turbo-tasks-malloc", default-features = false }
312312
turbo-tasks-testing = { path = "turbopack/crates/turbo-tasks-testing" }
313+
turbo-unix-path = { path = "turbopack/crates/turbo-unix-path" }
313314
turbopack = { path = "turbopack/crates/turbopack" }
314315
turbopack-bench = { path = "turbopack/crates/turbopack-bench" }
315316
turbopack-nodejs = { path = "turbopack/crates/turbopack-nodejs" }
@@ -422,6 +423,7 @@ napi = { version = "2", default-features = false, features = [
422423
"napi5",
423424
"compat-mode",
424425
] }
426+
nohash-hasher = "0.2.0"
425427
notify = "8.1.0"
426428
once_cell = "1.17.1"
427429
owo-colors = "4.2.2"
@@ -446,7 +448,6 @@ rstest = "0.16.0"
446448
rustc-hash = "2.1.1"
447449
semver = "1.0.16"
448450
serde = { version = "1.0.217", features = ["derive"] }
449-
serde_bytes = "0.11.15"
450451
serde_json = "1.0.138"
451452
serde_path_to_error = "0.1.16"
452453
serde_qs = "0.13.0"

0 commit comments

Comments
 (0)