development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-10-14 03:32:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix confusing error messages when using -Zsparse-registry

Browse source
This commit is contained in:
Arlo Siemsen 2022-10-24 11:07:02 -05:00
parent 6e9da768f5
commit 40293266b2
3 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/cargo/core/source/source_id.rs
View file

@ -428,7 +428,10 @@ impl SourceId {
let url = self.inner.url.as_str();
url == CRATES_IO_INDEX
|| url == CRATES_IO_HTTP_INDEX
|| std::env::var("__CARGO_TEST_CRATES_IO_URL_DO_NOT_USE_THIS").as_deref() == Ok(url)
|| std::env::var("__CARGO_TEST_CRATES_IO_URL_DO_NOT_USE_THIS")
.as_deref()
.map(|u| u.trim_start_matches("sparse+"))
== Ok(url)
}
/// Hashes `self`.

16
src/cargo/sources/replaced.rs
View file

@ -100,11 +100,17 @@ impl<'cfg> Source for ReplacedSource<'cfg> {
}
fn describe(&self) -> String {
format!(
"{} (which is replacing {})",
self.inner.describe(),
self.to_replace
)
if self.replace_with.is_crates_io() && self.to_replace.is_crates_io() {
// Built-in source replacement of crates.io for sparse registry or tests
// doesn't need duplicate description (crates.io replacing crates.io).
self.inner.describe()
} else {
format!(
"{} (which is replacing {})",
self.inner.describe(),
self.to_replace
)
}
}
fn is_replaced(&self) -> bool {

12
tests/testsuite/publish.rs
View file

@ -2319,13 +2319,13 @@ fn wait_for_publish() {
.with_status(0)
.with_stderr(
"\
[UPDATING] `crates-io` index
[UPDATING] crates.io index
[WARNING] manifest has no documentation, [..]
See [..]
[PACKAGING] delay v0.0.1 ([CWD])
[UPLOADING] delay v0.0.1 ([CWD])
[UPDATING] `crates-io` index
[WAITING] on `delay` to propagate to `crates-io` index (which is replacing registry `crates-io`) (ctrl-c to wait asynchronously)
[UPDATING] crates.io index
[WAITING] on `delay` to propagate to crates.io index (ctrl-c to wait asynchronously)
",
)
.run();
@ -2416,13 +2416,13 @@ fn wait_for_publish_underscore() {
.with_status(0)
.with_stderr(
"\
[UPDATING] `crates-io` index
[UPDATING] crates.io index
[WARNING] manifest has no documentation, [..]
See [..]
[PACKAGING] delay_with_underscore v0.0.1 ([CWD])
[UPLOADING] delay_with_underscore v0.0.1 ([CWD])
[UPDATING] `crates-io` index
[WAITING] on `delay_with_underscore` to propagate to `crates-io` index (which is replacing registry `crates-io`) (ctrl-c to wait asynchronously)
[UPDATING] crates.io index
[WAITING] on `delay_with_underscore` to propagate to crates.io index (ctrl-c to wait asynchronously)
",
)
.run();