diff --git a/src/cargo/ops/registry.rs b/src/cargo/ops/registry.rs index 1d1533c064ac..bbe08e29ee5c 100644 --- a/src/cargo/ops/registry.rs +++ b/src/cargo/ops/registry.rs @@ -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); diff --git a/tests/testsuite/publish.rs b/tests/testsuite/publish.rs index 6c77eacddccf..fa26e4bb0e13 100644 --- a/tests/testsuite/publish.rs +++ b/tests/testsuite/publish.rs @@ -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` ", @@ -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` ", @@ -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` ", @@ -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` ", @@ -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` ", @@ -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` ", @@ -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` ", @@ -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. @@ -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` ", diff --git a/tests/testsuite/source_replacement.rs b/tests/testsuite/source_replacement.rs index 7737958c5686..24f2ca3e3e3d 100644 --- a/tests/testsuite/source_replacement.rs +++ b/tests/testsuite/source_replacement.rs @@ -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` ", diff --git a/tests/testsuite/weak_dep_features.rs b/tests/testsuite/weak_dep_features.rs index e114625526ed..05aeeb9dc71e 100644 --- a/tests/testsuite/weak_dep_features.rs +++ b/tests/testsuite/weak_dep_features.rs @@ -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` ",