Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion crates/next-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
6 changes: 2 additions & 4 deletions turbopack/crates/turbo-tasks-fs/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion turbopack/crates/turbo-tasks-fs/src/read_glob.rs
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ async fn resolve_symlink_safely(entry: DirectoryEntry) -> Result<DirectoryEntry>
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,
)
}
}
Expand Down
2 changes: 1 addition & 1 deletion turbopack/crates/turbopack-bench/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
6 changes: 1 addition & 5 deletions turbopack/crates/turbopack-browser/src/ecmascript/content.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
Expand Down
6 changes: 1 addition & 5 deletions turbopack/crates/turbopack-browser/src/ecmascript/version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
2 changes: 1 addition & 1 deletion turbopack/crates/turbopack-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion turbopack/crates/turbopack-nft/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion turbopack/crates/turbopack-trace-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
Loading