itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reworking message to not care about an intial offset

Browse Source
This commit is contained in:
gilescope 2021-07-10 15:07:29 +01:00
parent 671ba3fdfe
commit dc0e53b7c1
No known key found for this signature in database
GPG Key ID: 631F6352D4A949EF
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cargo/core/resolver/errors.rs
View File

@ -285,7 +285,7 @@ pub(super) fn activation_error(
.collect();
candidates.sort_by_key(|o| o.0);
let mut msg = format!(
"no matching package named `{}` found\n", dep.package_name());
"no matching package found\nsearched package name: `{}`\n", dep.package_name());
if !candidates.is_empty() {
// If dependency package name is equal to the name of the candidate here
// it may be a prerelease package which hasn't been specified correctly
@ -309,8 +309,8 @@ pub(super) fn activation_error(
names.push("...");
}
// Vertically align first suggestion with missing crate name
// so the silly typo you probably made jumps out at you.
msg.push_str("perhaps you meant: ");
// so a typo jumps out at you.
msg.push_str("perhaps you meant: ");
msg.push_str(&names.iter().enumerate().fold(
String::default(),
|acc, (i, el)| match i {

5
tests/testsuite/directory.rs
View File

@ -191,9 +191,10 @@ fn simple_install_fail() {
error: failed to compile `bar v0.1.0`, intermediate artifacts can be found at `[..]`
Caused by:
no matching package named `baz` found
no matching package found
searched package name: `baz`
perhaps you meant: bar or foo
location searched: registry `https://github.com/rust-lang/crates.io-index`
perhaps you meant: bar or foo
required by package `bar v0.1.0`
",
)

5
tests/testsuite/path.rs
View File

@ -964,9 +964,10 @@ fn invalid_path_dep_in_workspace_with_lockfile() {
.with_status(101)
.with_stderr(
"\
error: no matching package named `bar` found
error: no matching package found
searched package name: `bar`
perhaps you meant: foo
location searched: [..]
perhaps you meant: foo
required by package `foo v0.5.0 ([..])`
",
)

12
tests/testsuite/registry.rs
View File

@ -155,9 +155,10 @@ fn wrong_case() {
.with_stderr(
"\
[UPDATING] [..] index
error: no matching package named `Init` found
error: no matching package found
searched package name: `Init`
perhaps you meant: init
location searched: registry [..]
perhaps you meant: init
required by package `foo v0.0.1 ([..])`
",
)
@ -190,9 +191,10 @@ fn mis_hyphenated() {
.with_stderr(
"\
[UPDATING] [..] index
error: no matching package named `mis_hyphenated` found
error: no matching package found
searched package name: `mis_hyphenated`
perhaps you meant: mis-hyphenated
location searched: registry [..]
perhaps you meant: mis-hyphenated
required by package `foo v0.0.1 ([..])`
",
)
@ -1439,9 +1441,9 @@ fn use_semver_package_incorrectly() {
.with_stderr(
"\
error: no matching package named `a` found
location searched: [..]
prerelease package needs to be specified explicitly
a = { version = \"0.1.1-alpha.0\" }
location searched: [..]
required by package `b v0.1.0 ([..])`
",
)