From 1c3b3026eb2a860249d657b2cba3c16ee04bc2af Mon Sep 17 00:00:00 2001 From: Benjamin Woodruff Date: Wed, 5 Nov 2025 22:21:29 -0800 Subject: [PATCH] Turbopack: Update anyhow, remove old backtrace feature --- Cargo.lock | 7 ++----- Cargo.toml | 2 +- crates/next-api/Cargo.toml | 2 +- turbopack/crates/turbo-tasks-fs/src/lib.rs | 6 ++---- turbopack/crates/turbo-tasks-fs/src/read_glob.rs | 2 +- turbopack/crates/turbopack-bench/Cargo.toml | 2 +- .../turbopack-browser/src/ecmascript/content.rs | 6 +----- .../src/ecmascript/evaluate/chunk.rs | 6 +----- .../turbopack-browser/src/ecmascript/version.rs | 6 +----- turbopack/crates/turbopack-cli/Cargo.toml | 2 +- turbopack/crates/turbopack-nft/Cargo.toml | 2 +- .../src/ecmascript/node/entry/chunk.rs | 11 +++-------- .../src/ecmascript/node/entry/runtime.rs | 6 +----- .../turbopack-nodejs/src/ecmascript/node/version.rs | 6 +----- turbopack/crates/turbopack-trace-server/Cargo.toml | 2 +- 15 files changed, 19 insertions(+), 49 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e186925b866ba..5e5f3e6e786d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -244,12 +244,9 @@ checksum = "70033777eb8b5124a81a1889416543dddef2de240019b674c81285a2635a7e1e" [[package]] name = "anyhow" -version = "1.0.98" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" -dependencies = [ - "backtrace", -] +checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" [[package]] name = "approx" diff --git a/Cargo.toml b/Cargo.toml index 6b358486375dd..7a1c1cf7a6268 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -371,7 +371,7 @@ tungstenite = "0.20.1" allsorts = { version = "0.14.0", default-features = false, features = [ "flate2_rust", ] } -anyhow = "1.0.98" +anyhow = "1.0.100" async-compression = { version = "0.3.13", default-features = false, features = [ "gzip", "tokio", diff --git a/crates/next-api/Cargo.toml b/crates/next-api/Cargo.toml index 6c6f878276c55..7aee602833372 100644 --- a/crates/next-api/Cargo.toml +++ b/crates/next-api/Cargo.toml @@ -13,7 +13,7 @@ bench = false workspace = true [dependencies] -anyhow = { workspace = true, features = ["backtrace"] } +anyhow = { workspace = true } byteorder = { workspace = true } either = { workspace = true } futures = { workspace = true } diff --git a/turbopack/crates/turbo-tasks-fs/src/lib.rs b/turbopack/crates/turbo-tasks-fs/src/lib.rs index 1765c6f8c816c..45655c78316fa 100644 --- a/turbopack/crates/turbo-tasks-fs/src/lib.rs +++ b/turbopack/crates/turbo-tasks-fs/src/lib.rs @@ -1533,10 +1533,8 @@ pub async fn rebase( let base_path = [&old_base.path, "/"].concat(); if !fs_path.path.starts_with(&base_path) { bail!( - "rebasing {} from {} onto {} doesn't work because it's not part of the source path", - fs_path.to_string(), - old_base.to_string(), - new_base.to_string() + "rebasing {fs_path} from {old_base} onto {new_base} doesn't work because it's not \ + part of the source path", ); } if new_base.path.is_empty() { diff --git a/turbopack/crates/turbo-tasks-fs/src/read_glob.rs b/turbopack/crates/turbo-tasks-fs/src/read_glob.rs index 26ab6b6023a7a..41708383c0809 100644 --- a/turbopack/crates/turbo-tasks-fs/src/read_glob.rs +++ b/turbopack/crates/turbo-tasks-fs/src/read_glob.rs @@ -124,7 +124,7 @@ async fn resolve_symlink_safely(entry: DirectoryEntry) -> Result if source_path.is_inside_or_equal(&resolved_entry.clone().path().unwrap()) { bail!( "'{}' is a symlink causes that causes an infinite loop!", - source_path.path.to_string() + source_path.path, ) } } diff --git a/turbopack/crates/turbopack-bench/Cargo.toml b/turbopack/crates/turbopack-bench/Cargo.toml index fb3d44ec9d24d..c0eed2654dbe1 100644 --- a/turbopack/crates/turbopack-bench/Cargo.toml +++ b/turbopack/crates/turbopack-bench/Cargo.toml @@ -17,7 +17,7 @@ harness = false workspace = true [dependencies] -anyhow = { workspace = true, features = ["backtrace"] } +anyhow = { workspace = true } chromiumoxide = { workspace = true, features = [ "tokio-runtime", ], default-features = false } diff --git a/turbopack/crates/turbopack-browser/src/ecmascript/content.rs b/turbopack/crates/turbopack-browser/src/ecmascript/content.rs index 5697aecfc4ba0..fc8e9d4bf31ca 100644 --- a/turbopack/crates/turbopack-browser/src/ecmascript/content.rs +++ b/turbopack/crates/turbopack-browser/src/ecmascript/content.rs @@ -84,11 +84,7 @@ impl EcmascriptBrowserChunkContent { let chunk_server_path = if let Some(path) = output_root.get_path_to(&chunk_path) { path } else { - bail!( - "chunk path {} is not in output root {}", - chunk_path.to_string(), - output_root.to_string() - ); + bail!("chunk path {chunk_path} is not in output root {output_root}"); }; Either::Left(StringifyJs(chunk_server_path)) } diff --git a/turbopack/crates/turbopack-browser/src/ecmascript/evaluate/chunk.rs b/turbopack/crates/turbopack-browser/src/ecmascript/evaluate/chunk.rs index 9f45733430b87..d25bd932a4a78 100644 --- a/turbopack/crates/turbopack-browser/src/ecmascript/evaluate/chunk.rs +++ b/turbopack/crates/turbopack-browser/src/ecmascript/evaluate/chunk.rs @@ -99,11 +99,7 @@ impl EcmascriptBrowserEvaluateChunk { let chunk_server_path = if let Some(path) = output_root.get_path_to(&chunk_path) { path } else { - bail!( - "chunk path {} is not in output root {}", - chunk_path.to_string(), - output_root.to_string() - ); + bail!("chunk path {chunk_path} is not in output root {output_root}"); }; Either::Left(StringifyJs(chunk_server_path)) } diff --git a/turbopack/crates/turbopack-browser/src/ecmascript/version.rs b/turbopack/crates/turbopack-browser/src/ecmascript/version.rs index 9c2ab8f0574f4..1442e6669703d 100644 --- a/turbopack/crates/turbopack-browser/src/ecmascript/version.rs +++ b/turbopack/crates/turbopack-browser/src/ecmascript/version.rs @@ -27,11 +27,7 @@ impl EcmascriptBrowserChunkVersion { let chunk_path = if let Some(path) = output_root.get_path_to(&chunk_path) { path } else { - bail!( - "chunk path {} is not in client root {}", - chunk_path.to_string(), - output_root.to_string() - ); + bail!("chunk path {chunk_path} is not in client root {output_root}"); }; let entries = EcmascriptBrowserChunkContentEntries::new(content).await?; let mut entries_hashes = diff --git a/turbopack/crates/turbopack-cli/Cargo.toml b/turbopack/crates/turbopack-cli/Cargo.toml index 4548dc2a3e653..d885720bec742 100644 --- a/turbopack/crates/turbopack-cli/Cargo.toml +++ b/turbopack/crates/turbopack-cli/Cargo.toml @@ -37,7 +37,7 @@ custom_allocator = ["turbo-tasks-malloc/custom_allocator"] workspace = true [dependencies] -anyhow = { workspace = true, features = ["backtrace"] } +anyhow = { workspace = true } clap = { workspace = true, features = ["derive", "env"] } console-subscriber = { workspace = true, optional = true } dunce = { workspace = true } diff --git a/turbopack/crates/turbopack-nft/Cargo.toml b/turbopack/crates/turbopack-nft/Cargo.toml index 26b4252cf47ce..44a4c7f19ca83 100644 --- a/turbopack/crates/turbopack-nft/Cargo.toml +++ b/turbopack/crates/turbopack-nft/Cargo.toml @@ -18,7 +18,7 @@ bench = false workspace = true [dependencies] -anyhow = { workspace = true, features = ["backtrace"] } +anyhow = { workspace = true } clap = { workspace = true, features = ["derive", "env"] } console-subscriber = { workspace = true, optional = true } rustc-hash = { workspace = true } diff --git a/turbopack/crates/turbopack-nodejs/src/ecmascript/node/entry/chunk.rs b/turbopack/crates/turbopack-nodejs/src/ecmascript/node/entry/chunk.rs index 3252c37509aaa..f20caa4ff84ac 100644 --- a/turbopack/crates/turbopack-nodejs/src/ecmascript/node/entry/chunk.rs +++ b/turbopack/crates/turbopack-nodejs/src/ecmascript/node/entry/chunk.rs @@ -69,19 +69,14 @@ impl EcmascriptBuildNodeEntryChunk { path } else { bail!( - "cannot find a relative path from the chunk ({}) to the runtime chunk ({})", - chunk_path.to_string(), - runtime_path.to_string(), + "cannot find a relative path from the chunk ({chunk_path}) to the runtime \ + chunk ({runtime_path})", ); }; let chunk_public_path = if let Some(path) = output_root.get_path_to(&chunk_path) { path } else { - bail!( - "chunk path ({}) is not in output root ({})", - chunk_path.to_string(), - output_root.to_string() - ); + bail!("chunk path ({chunk_path}) is not in output root ({output_root})"); }; let mut code = CodeBuilder::default(); diff --git a/turbopack/crates/turbopack-nodejs/src/ecmascript/node/entry/runtime.rs b/turbopack/crates/turbopack-nodejs/src/ecmascript/node/entry/runtime.rs index bc83260d8c98d..f17eaa5b1d15b 100644 --- a/turbopack/crates/turbopack-nodejs/src/ecmascript/node/entry/runtime.rs +++ b/turbopack/crates/turbopack-nodejs/src/ecmascript/node/entry/runtime.rs @@ -46,11 +46,7 @@ impl EcmascriptBuildNodeRuntimeChunk { let runtime_public_path = if let Some(path) = output_root.get_path_to(&runtime_path) { path } else { - bail!( - "runtime path {} is not in output root {}", - runtime_path.to_string(), - output_root.to_string() - ); + bail!("runtime path {runtime_path} is not in output root {output_root}"); }; let mut code = CodeBuilder::default(); diff --git a/turbopack/crates/turbopack-nodejs/src/ecmascript/node/version.rs b/turbopack/crates/turbopack-nodejs/src/ecmascript/node/version.rs index c3f3537f88f7b..68179126defd3 100644 --- a/turbopack/crates/turbopack-nodejs/src/ecmascript/node/version.rs +++ b/turbopack/crates/turbopack-nodejs/src/ecmascript/node/version.rs @@ -27,11 +27,7 @@ impl EcmascriptBuildNodeChunkVersion { let chunk_path = if let Some(path) = output_root.get_path_to(&chunk_path) { path } else { - bail!( - "chunk path {} is not in client root {}", - chunk_path.to_string(), - output_root.to_string() - ); + bail!("chunk path {chunk_path} is not in client root {output_root}"); }; let chunk_items = content.await?.chunk_item_code_and_ids().await?; Ok(EcmascriptBuildNodeChunkVersion { diff --git a/turbopack/crates/turbopack-trace-server/Cargo.toml b/turbopack/crates/turbopack-trace-server/Cargo.toml index c98c3d46d281b..d3b845b3be3e3 100644 --- a/turbopack/crates/turbopack-trace-server/Cargo.toml +++ b/turbopack/crates/turbopack-trace-server/Cargo.toml @@ -12,7 +12,7 @@ path = "src/main.rs" bench = false [dependencies] -anyhow = { workspace = true, features = ["backtrace"] } +anyhow = { workspace = true } either = { workspace = true } flate2 = { workspace = true } hashbrown = { workspace = true, features = ["raw"] }