itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add context for which workspace failed when resolving cargo vendor

Browse Source
This commit is contained in:
Eric Huss 2025-03-11 09:37:02 -07:00
parent bf3885e0c6
commit 2158fe1357
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cargo/ops/vendor.rs
View File

@ -144,12 +144,12 @@ fn sync(
// attempt. If anything fails here we basically just move on to the next // attempt. If anything fails here we basically just move on to the next
// crate to work with. // crate to work with.
for ws in workspaces { for ws in workspaces {
let (packages, resolve) = let (packages, resolve) = ops::resolve_ws(ws, dry_run)
ops::resolve_ws(ws, dry_run).context("failed to load pkg lockfile")?; .with_context(|| format!("failed to load lockfile for {}", ws.root().display()))?;
packages packages
.get_many(resolve.iter()) .get_many(resolve.iter())
.context("failed to download packages")?; .with_context(|| format!("failed to download packages for {}", ws.root().display()))?;
for pkg in resolve.iter() { for pkg in resolve.iter() {
let sid = if opts.respect_source_config { let sid = if opts.respect_source_config {
@ -187,12 +187,12 @@ fn sync(
// Next up let's actually download all crates and start storing internal // Next up let's actually download all crates and start storing internal
// tables about them. // tables about them.
for ws in workspaces { for ws in workspaces {
let (packages, resolve) = let (packages, resolve) = ops::resolve_ws(ws, dry_run)
ops::resolve_ws(ws, dry_run).context("failed to load pkg lockfile")?; .with_context(|| format!("failed to load lockfile for {}", ws.root().display()))?;
packages packages
.get_many(resolve.iter()) .get_many(resolve.iter())
.context("failed to download packages")?; .with_context(|| format!("failed to download packages for {}", ws.root().display()))?;
for pkg in resolve.iter() { for pkg in resolve.iter() {
// No need to vendor path crates since they're already in the // No need to vendor path crates since they're already in the

4
tests/testsuite/vendor.rs
View File

@ -2016,7 +2016,7 @@ fn error_loading_which_lock() {
[ERROR] failed to sync [ERROR] failed to sync
Caused by: Caused by:
failed to load pkg lockfile failed to load lockfile for [ROOT]/foo/b
Caused by: Caused by:
could not execute process `does-not-exist -vV` (never executed) could not execute process `does-not-exist -vV` (never executed)
@ -2056,7 +2056,7 @@ fn error_downloading() {
[ERROR] failed to sync [ERROR] failed to sync
Caused by: Caused by:
failed to download packages failed to download packages for [ROOT]/foo
Caused by: Caused by:
failed to download from `[ROOTURL]/dl/bar/1.0.0/download` failed to download from `[ROOTURL]/dl/bar/1.0.0/download`