Reword published/completed to uploaded/published

Author: ehuss

crates/cargo-test-support/src/compare.rs

@@ -211,6 +211,7 @@ fn substitute_macros(input: &str) -> String {
         ("[DOWNLOADING]", " Downloading"),
         ("[DOWNLOADED]", "  Downloaded"),
         ("[UPLOADING]", "   Uploading"),
+        ("[UPLOADED]", "    Uploaded"),
         ("[VERIFYING]", "   Verifying"),
         ("[ARCHIVING]", "   Archiving"),
         ("[INSTALLING]", "  Installing"),

src/cargo/ops/registry.rs

@@ -453,9 +453,12 @@ fn wait_for_publish(
     let now = std::time::Instant::now();
     let sleep_time = std::time::Duration::from_secs(1);
     let max = timeout.as_secs() as usize;
-    config.shell().status("Published", pkg.to_string())?;
     // Short does not include the registry name.
     let short_pkg_description = format!("{} v{}", pkg.name(), pkg.version());
+    config.shell().status(
+        "Uploaded",
+        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\
         You may press ctrl-c to skip waiting; the crate should be available shortly."
@@ -505,8 +508,8 @@ fn wait_for_publish(
     };
     if is_available {
         config.shell().status(
-            "Completed",
-            format!("{pkg} has been successfully published to {source_description}"),
+            "Published",
+            format!("{short_pkg_description} at {source_description}"),
         )?;
     }
 

tests/testsuite/artifact_dep.rs

@@ -1911,10 +1911,10 @@ fn publish_artifact_dep() {
 [PACKAGING] foo v0.1.0 [..]
 [PACKAGED] [..]
 [UPLOADING] foo v0.1.0 [..]
-[PUBLISHED] foo v0.1.0 [..]
+[UPLOADED] foo v0.1.0 [..]
 note: Waiting [..]
 You may press ctrl-c [..]
-[COMPLETED] foo v0.1.0 [..]
+[PUBLISHED] foo v0.1.0 [..]
 ",
         )
         .run();

tests/testsuite/credential_process.rs

@@ -130,10 +130,10 @@ Only one of these values may be set, remove one or the other to proceed.
 [PACKAGING] foo v0.1.0 [..]
 [PACKAGED] [..]
 [UPLOADING] foo v0.1.0 [..]
-[PUBLISHED] foo v0.1.0 [..]
+[UPLOADED] foo v0.1.0 [..]
 note: Waiting [..]
 You may press ctrl-c [..]
-[COMPLETED] foo v0.1.0 [..]
+[PUBLISHED] foo v0.1.0 [..]
 ",
         )
         .run();
@@ -225,10 +225,10 @@ fn publish() {
 [PACKAGING] foo v0.1.0 [..]
 [PACKAGED] [..]
 [UPLOADING] foo v0.1.0 [..]
-[PUBLISHED] foo v0.1.0 [..]
+[UPLOADED] foo v0.1.0 [..]
 note: Waiting [..]
 You may press ctrl-c [..]
-[COMPLETED] foo v0.1.0 [..]
+[PUBLISHED] foo v0.1.0 [..]
 ",
         )
         .run();

tests/testsuite/cross_publish.rs

@@ -112,10 +112,10 @@ fn publish_with_target() {
 [FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
 [PACKAGED] [..]
 [UPLOADING] foo v0.0.0 ([CWD])
-[PUBLISHED] foo v0.0.0 ([CWD])
+[UPLOADED] foo v0.0.0 to registry `crates-io`
 note: Waiting [..]
 You may press ctrl-c [..]
-[COMPLETED] foo v0.0.0 [..]
+[PUBLISHED] foo v0.0.0 at registry `crates-io`
 ",
         )
         .run();

tests/testsuite/features_namespaced.rs

@@ -894,10 +894,10 @@ fn publish_no_implicit() {
 [PACKAGING] foo v0.1.0 [..]
 [PACKAGED] [..]
 [UPLOADING] foo v0.1.0 [..]
-[PUBLISHED] foo v0.1.0 [..]
+[UPLOADED] foo v0.1.0 [..]
 note: Waiting [..]
 You may press ctrl-c [..]
-[COMPLETED] foo v0.1.0 [..]
+[PUBLISHED] foo v0.1.0 [..]
 ",
         )
         .run();
@@ -1016,10 +1016,10 @@ fn publish() {
 [FINISHED] [..]
 [PACKAGED] [..]
 [UPLOADING] foo v0.1.0 [..]
-[PUBLISHED] foo v0.1.0 [..]
+[UPLOADED] foo v0.1.0 [..]
 note: Waiting [..]
 You may press ctrl-c [..]
-[COMPLETED] foo v0.1.0 [..]
+[PUBLISHED] foo v0.1.0 [..]
 ",
         )
         .run();