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

fix(publish): Pluralize the wait message

Browse Source
This commit is contained in:
Ed Page 2025-06-04 17:52:55 -05:00
parent 8c401a2674
commit ba789f04c7
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cargo/ops/registry/publish.rs
View File

@ -274,7 +274,8 @@ pub fn publish(ws: &Workspace<'_>, opts: &PublishOpts<'_>) -> CargoResult<()> {
let short_pkg_descriptions = package_list(to_confirm.iter().copied(), "or"); let short_pkg_descriptions = package_list(to_confirm.iter().copied(), "or");
opts.gctx.shell().note(format!( opts.gctx.shell().note(format!(
"waiting for {short_pkg_descriptions} to be available at {source_description}.\n\ "waiting for {short_pkg_descriptions} to be available at {source_description}.\n\
You may press ctrl-c to skip waiting; the crate should be available shortly." You may press ctrl-c to skip waiting; the {crate} should be available shortly.",
crate = if to_confirm.len() == 1 { "crate" } else {"crates"}
))?; ))?;
let timeout = Duration::from_secs(timeout); let timeout = Duration::from_secs(timeout);
@ -299,10 +300,15 @@ pub fn publish(ws: &Workspace<'_>, opts: &PublishOpts<'_>) -> CargoResult<()> {
opts.gctx.shell().warn(format!( opts.gctx.shell().warn(format!(
"timed out waiting for {short_pkg_descriptions} to be available in {source_description}", "timed out waiting for {short_pkg_descriptions} to be available in {source_description}",
))?; ))?;
opts.gctx.shell().note( opts.gctx.shell().note(format!(
"the registry may have a backlog that is delaying making the \ "the registry may have a backlog that is delaying making the \
crate available. The crate should be available soon.", {crate} available. The {crate} should be available soon.",
)?; crate = if to_confirm.len() == 1 {
"crate"
} else {
"crates"
}
))?;
} }
confirmed confirmed
} else { } else {

2
tests/testsuite/publish.rs
View File

@ -3890,7 +3890,7 @@ fn workspace_parallel() {
[UPLOADED] b v0.0.1 to registry `crates-io` [UPLOADED] b v0.0.1 to registry `crates-io`
[UPLOADED] a v0.0.1 to registry `crates-io` [UPLOADED] a v0.0.1 to registry `crates-io`
[NOTE] waiting for `a v0.0.1` or `b v0.0.1` to be available at registry `crates-io`. [NOTE] waiting for `a v0.0.1` or `b v0.0.1` to be available at registry `crates-io`.
You may press ctrl-c to skip waiting; the crate should be available shortly. You may press ctrl-c to skip waiting; the crates should be available shortly.
[PUBLISHED] a v0.0.1, b v0.0.1 at registry `crates-io` [PUBLISHED] a v0.0.1, b v0.0.1 at registry `crates-io`
[UPLOADING] c v0.0.1 ([ROOT]/foo/c) [UPLOADING] c v0.0.1 ([ROOT]/foo/c)
[UPLOADED] c v0.0.1 to registry `crates-io` [UPLOADED] c v0.0.1 to registry `crates-io`