Skip to content

Commit

Permalink
Remove "up to 60 seconds" from waiting message.
Browse files Browse the repository at this point in the history
This level of detail isn't particularly important to the user and
just clutters up the output.
  • Loading branch information
ehuss committed Feb 17, 2023
1 parent 460d917 commit fade07e
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/cargo/ops/registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ fn wait_for_publish(
format!("{short_pkg_description} to {source_description}"),
)?;
config.shell().note(format!(
"Waiting up to {max} seconds for `{short_pkg_description}` to be available at {source_description}.\n\
"Waiting for `{short_pkg_description}` to be available at {source_description}.\n\
You may press ctrl-c to skip waiting; the crate should be available shortly."
))?;
let mut progress = Progress::with_style("Waiting", ProgressStyle::Ratio, config);
Expand Down
18 changes: 9 additions & 9 deletions tests/testsuite/publish.rs
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ See [..]
[PACKAGED] [..] files, [..] ([..] compressed)
[UPLOADING] foo v0.0.1 ([CWD])
[UPLOADED] foo v0.0.1 to registry `crates-io`
note: Waiting up to 60 seconds for `foo v0.0.1` to be available at registry `crates-io`.
note: Waiting for `foo v0.0.1` to be available at registry `crates-io`.
You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] foo v0.0.1 at registry `crates-io`
",
Expand Down Expand Up @@ -169,7 +169,7 @@ See [..]
[PACKAGED] [..] files, [..] ([..] compressed)
[UPLOADING] foo v0.0.1 ([CWD])
[UPLOADED] foo v0.0.1 to registry `dummy-registry`
note: Waiting up to 60 seconds for `foo v0.0.1` to be available at registry `dummy-registry`.
note: Waiting for `foo v0.0.1` to be available at registry `dummy-registry`.
You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] foo v0.0.1 at registry `dummy-registry`
",
Expand Down Expand Up @@ -212,7 +212,7 @@ See [..]
[PACKAGED] [..] files, [..] ([..] compressed)
[UPLOADING] foo v0.0.1 ([CWD])
[UPLOADED] foo v0.0.1 to registry `dummy-registry`
note: Waiting up to 60 seconds for `foo v0.0.1` to be available at registry `dummy-registry`.
note: Waiting for `foo v0.0.1` to be available at registry `dummy-registry`.
You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] foo v0.0.1 at registry `dummy-registry`
",
Expand Down Expand Up @@ -854,7 +854,7 @@ fn publish_allowed_registry() {
[..]
[UPLOADING] foo v0.0.1 ([CWD])
[UPLOADED] foo v0.0.1 to registry `alternative`
note: Waiting up to 60 seconds for `foo v0.0.1` to be available at registry `alternative`.
note: Waiting for `foo v0.0.1` to be available at registry `alternative`.
You may press ctrl-c [..]
[PUBLISHED] foo v0.0.1 at registry `alternative`
",
Expand Down Expand Up @@ -2596,7 +2596,7 @@ See [..]
[PACKAGED] [..] files, [..] ([..] compressed)
[UPLOADING] delay v0.0.1 ([CWD])
[UPLOADED] delay v0.0.1 to registry `crates-io`
note: Waiting up to 60 seconds for `delay v0.0.1` to be available at registry `crates-io`.
note: Waiting for `delay v0.0.1` to be available at registry `crates-io`.
You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] delay v0.0.1 at registry `crates-io`
",
Expand Down Expand Up @@ -2678,7 +2678,7 @@ See [..]
[PACKAGED] [..] files, [..] ([..] compressed)
[UPLOADING] delay_with_underscore v0.0.1 ([CWD])
[UPLOADED] delay_with_underscore v0.0.1 to registry `crates-io`
note: Waiting up to 60 seconds for `delay_with_underscore v0.0.1` to be available at registry `crates-io`.
note: Waiting for `delay_with_underscore v0.0.1` to be available at registry `crates-io`.
You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] delay_with_underscore v0.0.1 at registry `crates-io`
",
Expand Down Expand Up @@ -2770,7 +2770,7 @@ See [..]
[PACKAGED] [..] files, [..] ([..] compressed)
[UPLOADING] delay v0.0.2 ([CWD])
[UPLOADED] delay v0.0.2 to registry `crates-io`
note: Waiting up to 60 seconds for `delay v0.0.2` to be available at registry `crates-io`.
note: Waiting for `delay v0.0.2` to be available at registry `crates-io`.
You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] delay v0.0.2 at registry `crates-io`
",
Expand Down Expand Up @@ -2886,7 +2886,7 @@ See [..]
[PACKAGED] [..] files, [..] ([..] compressed)
[UPLOADING] delay v0.0.1 ([CWD])
[UPLOADED] delay v0.0.1 to registry `crates-io`
note: Waiting up to 2 seconds for `delay v0.0.1` to be available at registry `crates-io`.
note: Waiting for `delay v0.0.1` to be available at registry `crates-io`.
You may press ctrl-c to skip waiting; the crate should be available shortly.
warning: timed out waiting for `delay v0.0.1` to be available in registry `crates-io`
note: The registry may have a backlog that is delaying making the crate available. The crate should be available soon.
Expand Down Expand Up @@ -2935,7 +2935,7 @@ See [..]
[PACKAGED] [..] files, [..] ([..] compressed)
[UPLOADING] delay v0.0.2 ([CWD])
[UPLOADED] delay v0.0.2 to registry `crates-io`
note: Waiting up to 60 seconds for `delay v0.0.2` to be available at registry `crates-io`.
note: Waiting for `delay v0.0.2` to be available at registry `crates-io`.
You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] delay v0.0.2 at registry `crates-io`
",
Expand Down
2 changes: 1 addition & 1 deletion tests/testsuite/source_replacement.rs
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for
[PACKAGED] [..]
[UPLOADING] foo v0.0.1 ([..])
[UPLOADED] foo v0.0.1 to registry `crates-io`
note: Waiting up to 60 seconds for `foo v0.0.1` to be available at registry `crates-io`.
note: Waiting for `foo v0.0.1` to be available at registry `crates-io`.
You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] foo v0.0.1 at registry `crates-io`
",
Expand Down
2 changes: 1 addition & 1 deletion tests/testsuite/weak_dep_features.rs
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ fn publish() {
[PACKAGED] [..]
[UPLOADING] foo v0.1.0 [..]
[UPLOADED] foo v0.1.0 to registry `crates-io`
note: Waiting up to 60 seconds for `foo v0.1.0` to be available at registry `crates-io`.
note: Waiting for `foo v0.1.0` to be available at registry `crates-io`.
You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] foo v0.1.0 at registry `crates-io`
",
Expand Down

0 comments on commit fade07e

Please sign in to comment.