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

Provide extra context on a query failure.

Browse Source
This commit is contained in:
Eric Huss 2020-02-25 10:17:11 -08:00
parent 9c29861b20
commit a07fec1b7b
13 changed files with 100 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cargo/core/registry.rs
View File

@ -256,8 +256,7 @@ impl<'cfg> PackageRegistry<'cfg> {
self.ensure_loaded(dep.source_id(), Kind::Normal)
.chain_err(|| {
anyhow::format_err!(
"failed to load source for a dependency \
on `{}`",
"failed to load source for dependency `{}`",
dep.package_name()
)
})?;
@ -517,8 +516,7 @@ impl<'cfg> Registry for PackageRegistry<'cfg> {
self.ensure_loaded(dep.source_id(), Kind::Normal)
.chain_err(|| {
anyhow::format_err!(
"failed to load source for a dependency \
on `{}`",
"failed to load source for dependency `{}`",
dep.package_name()
)
})?;

10
src/cargo/core/resolver/dep_cache.rs
View File

@ -17,7 +17,7 @@ use log::debug;
use crate::core::interning::InternedString;
use crate::core::{Dependency, FeatureValue, PackageId, PackageIdSpec, Registry, Summary};
use crate::util::errors::CargoResult;
use crate::util::errors::{CargoResult, CargoResultExt};
use crate::core::resolver::types::{ConflictReason, DepInfo, FeaturesSet};
use crate::core::resolver::{ActivateResult, ResolveOpts};
@ -220,7 +220,13 @@ impl<'a> RegistryQueryer<'a> {
let mut deps = deps
.into_iter()
.map(|(dep, features)| {
let candidates = self.query(&dep)?;
let candidates = self.query(&dep).chain_err(|| {
anyhow::format_err!(
"failed to get `{}` as a dependency of `{}`",
dep.package_name(),
candidate.package_id(),
)
})?;
Ok((dep, candidates, features))
})
.collect::<CargoResult<Vec<DepInfo>>>()?;

20
tests/testsuite/bad_config.rs
View File

@ -368,7 +368,10 @@ fn bad_git_dependency() {
.with_stderr(
"\
[UPDATING] git repository `file:///`
[ERROR] failed to load source for a dependency on `foo`
[ERROR] failed to get `foo` as a dependency of `foo v0.0.0 [..]`
Caused by:
failed to load source for dependency `foo`
Caused by:
Unable to update file:///
@ -901,7 +904,10 @@ fn bad_source_config2() {
.with_status(101)
.with_stderr(
"\
error: failed to load source for a dependency on `bar`
[ERROR] failed to get `bar` as a dependency of `foo v0.0.0 [..]`
Caused by:
failed to load source for dependency `bar`
Caused by:
Unable to update registry `https://[..]`
@ -944,7 +950,10 @@ fn bad_source_config3() {
.with_status(101)
.with_stderr(
"\
error: failed to load source for a dependency on `bar`
[ERROR] failed to get `bar` as a dependency of `foo v0.0.0 [..]`
Caused by:
failed to load source for dependency `bar`
Caused by:
Unable to update registry `https://[..]`
@ -989,7 +998,10 @@ fn bad_source_config4() {
.with_status(101)
.with_stderr(
"\
error: failed to load source for a dependency on `bar`
[ERROR] failed to get `bar` as a dependency of `foo v0.0.0 ([..])`
Caused by:
failed to load source for dependency `bar`
Caused by:
Unable to update registry `https://[..]`

5
tests/testsuite/cargo_features.rs
View File

@ -199,7 +199,10 @@ fn nightly_feature_requires_nightly_in_dep() {
.with_status(101)
.with_stderr(
"\
error: failed to load source for a dependency on `a`
[ERROR] failed to get `a` as a dependency of `b v0.0.1 ([..])`
Caused by:
failed to load source for dependency `a`
Caused by:
Unable to update [..]

5
tests/testsuite/directory.rs
View File

@ -652,7 +652,10 @@ fn git_override_requires_lockfile() {
.with_status(101)
.with_stderr(
"\
error: failed to load source for a dependency on `git`
[ERROR] failed to get `git` as a dependency of `foo v0.0.1 ([..])`
Caused by:
failed to load source for dependency `git`
Caused by:
Unable to update [..]

37
tests/testsuite/git.rs
View File

@ -931,7 +931,10 @@ fn dep_with_bad_submodule() {
let expected = format!(
"\
[UPDATING] git repository [..]
[ERROR] failed to load source for a dependency on `dep1`
[ERROR] failed to get `dep1` as a dependency of `foo v0.5.0 [..]`
Caused by:
failed to load source for dependency `dep1`
Caused by:
Unable to update {}
@ -2382,20 +2385,24 @@ fn invalid_git_dependency_manifest() {
.cargo("build")
.with_status(101)
.with_stderr(&format!(
"[UPDATING] git repository `{}`\n\
error: failed to load source for a dependency on `dep1`\n\
\n\
Caused by:\n \
Unable to update {}\n\
\n\
Caused by:\n \
failed to parse manifest at `[..]`\n\
\n\
Caused by:\n \
could not parse input as TOML\n\
\n\
Caused by:\n \
duplicate key: `categories` for key `project` at line 10 column 17",
"\
[UPDATING] git repository `{}`
[ERROR] failed to get `dep1` as a dependency of `foo v0.5.0 ([..])`
Caused by:
failed to load source for dependency `dep1`
Caused by:
Unable to update {}
Caused by:
failed to parse manifest at `[..]`
Caused by:
could not parse input as TOML
Caused by:
duplicate key: `categories` for key `project` at line 10 column 17",
path2url(&git_root),
path2url(&git_root),
))

5
tests/testsuite/git_auth.rs
View File

@ -133,7 +133,10 @@ fn http_auth_offered() {
.with_stderr_contains(&format!(
"\
[UPDATING] git repository `http://{addr}/foo/bar`
[ERROR] failed to load source for a dependency on `bar`
[ERROR] failed to get `bar` as a dependency of `foo v0.0.1 [..]`
Caused by:
failed to load source for dependency `bar`
Caused by:
Unable to update http://{addr}/foo/bar

5
tests/testsuite/local_registry.rs
View File

@ -360,7 +360,10 @@ fn invalid_dir_bad() {
.with_status(101)
.with_stderr(
"\
[ERROR] failed to load source for a dependency on `bar`
[ERROR] failed to get `bar` as a dependency of `foo v0.0.1 [..]`
Caused by:
failed to load source for dependency `bar`
Caused by:
Unable to update registry `https://[..]`

5
tests/testsuite/offline.rs
View File

@ -270,7 +270,10 @@ fn cargo_compile_forbird_git_httpsrepo_offline() {
.build();
p.cargo("build --offline").with_status(101).with_stderr("\
error: failed to load source for a dependency on `dep1`
[ERROR] failed to get `dep1` as a dependency of `foo v0.5.0 [..]`
Caused by:
failed to load source for dependency `dep1`
Caused by:
Unable to update https://github.com/some_user/dep1.git

5
tests/testsuite/path.rs
View File

@ -521,7 +521,10 @@ fn error_message_for_missing_manifest() {
.with_status(101)
.with_stderr(
"\
[ERROR] failed to load source for a dependency on `bar`
[ERROR] failed to get `bar` as a dependency of `foo v0.5.0 [..]`
Caused by:
failed to load source for dependency `bar`
Caused by:
Unable to update [CWD]/src/bar

5
tests/testsuite/registry.rs
View File

@ -1558,7 +1558,10 @@ fn disallow_network() {
.with_status(101)
.with_stderr(
"\
error: failed to load source for a dependency on `foo`
[ERROR] failed to get `foo` as a dependency of `bar v0.5.0 [..]`
Caused by:
failed to load source for dependency `foo`
Caused by:
Unable to update registry [..]

15
tests/testsuite/replace.rs
View File

@ -544,7 +544,10 @@ fn override_wrong_name() {
"\
[UPDATING] [..] index
[UPDATING] git repository [..]
error: no matching package for override `[..]baz:0.1.0` found
[ERROR] failed to get `baz` as a dependency of `foo v0.0.1 ([..])`
Caused by:
no matching package for override `[..]baz:0.1.0` found
location searched: file://[..]
version required: = 0.1.0
",
@ -588,7 +591,10 @@ fn override_with_nothing() {
"\
[UPDATING] [..] index
[UPDATING] git repository [..]
[ERROR] failed to load source for a dependency on `bar`
[ERROR] failed to get `bar` as a dependency of `foo v0.0.1 ([..])`
Caused by:
failed to load source for dependency `bar`
Caused by:
Unable to update file://[..]
@ -671,7 +677,10 @@ fn multiple_specs() {
"\
[UPDATING] [..] index
[UPDATING] git repository [..]
error: overlapping replacement specifications found:
[ERROR] failed to get `bar` as a dependency of `foo v0.0.1 ([..])`
Caused by:
overlapping replacement specifications found:
* [..]
* [..]

20
tests/testsuite/workspaces.rs
View File

@ -2203,7 +2203,7 @@ fn ws_warn_path() {
#[cargo_test]
fn invalid_missing() {
// Warnings include path to manifest.
// Make sure errors are not suppressed with -q.
let p = project()
.file(
"Cargo.toml",
@ -2223,16 +2223,20 @@ fn invalid_missing() {
.with_status(101)
.with_stderr(
"\
error: [..]
[ERROR] failed to get `x` as a dependency of `foo v0.1.0 [..]`
Caused by:
failed to load source for dependency `x`
Caused by:
Unable to update [..]/foo/x
Caused by:
failed to read `[..]foo/x/Cargo.toml`
Caused by:
[..]
Caused by:
[..]
Caused by:
[..]",
",
)
.run();
}