rustup: tweak update check output style

djc · djc · commit d676c6f00768 · 2025-10-26T12:31:30.000Z
diff --git a/src/cli/rustup_mode.rs b/src/cli/rustup_mode.rs
@@ -873,18 +873,18 @@ async fn check_updates(cfg: &Cfg<'_>, opts: CheckOpts) -> Result<ExitCode> {
                         format!("{styled_name}{error}{m}{error:#}")
                     }
                     (Some(cv), None) => {
-                        let m = "Up to date";
-                        format!("{styled_name}{good}{m}{good:#} : {cv}")
+                        let m = "up to date";
+                        format!("{styled_name}{good}{m}{good:#}: {cv}")
                     }
                     (Some(cv), Some(dv)) => {
-                        let m = "Update available";
+                        let m = "update available";
                         update_a = true;
-                        format!("{styled_name}{warn}{m}{warn:#} : {cv} -> {dv}")
+                        format!("{styled_name}{warn}{m}{warn:#}: {cv} -> {dv}")
                     }
                     (None, Some(dv)) => {
-                        let m = "Update available";
+                        let m = "update available";
                         update_a = true;
-                        format!("{styled_name}{warn}{m}{warn:#} : (Unknown version) -> {dv}")
+                        format!("{styled_name}{warn}{m}{warn:#}: (unknown version) -> {dv}")
                     }
                 };
                 pb.set_style(ProgressStyle::with_template(message.as_str()).unwrap());
diff --git a/tests/suite/cli_exact.rs b/tests/suite/cli_exact.rs
@@ -184,9 +184,9 @@ async fn check_updates_none() {
         .await
         .is_err()
         .with_stdout(snapbox::str![[r#"
-stable-[HOST_TRIPLE] - Up to date : 1.1.0 (hash-stable-1.1.0)
-beta-[HOST_TRIPLE] - Up to date : 1.2.0 (hash-beta-1.2.0)
-nightly-[HOST_TRIPLE] - Up to date : 1.3.0 (hash-nightly-2)
+stable-[HOST_TRIPLE] - up to date: 1.1.0 (hash-stable-1.1.0)
+beta-[HOST_TRIPLE] - up to date: 1.2.0 (hash-beta-1.2.0)
+nightly-[HOST_TRIPLE] - up to date: 1.3.0 (hash-nightly-2)
 
 "#]]);
 }
@@ -209,9 +209,9 @@ async fn check_updates_some() {
         .await
         .is_ok()
         .with_stdout(snapbox::str![[r#"
-stable-[HOST_TRIPLE] - Update available : 1.0.0 (hash-stable-1.0.0) -> 1.1.0 (hash-stable-1.1.0)
-beta-[HOST_TRIPLE] - Update available : 1.1.0 (hash-beta-1.1.0) -> 1.2.0 (hash-beta-1.2.0)
-nightly-[HOST_TRIPLE] - Update available : 1.2.0 (hash-nightly-1) -> 1.3.0 (hash-nightly-2)
+stable-[HOST_TRIPLE] - update available: 1.0.0 (hash-stable-1.0.0) -> 1.1.0 (hash-stable-1.1.0)
+beta-[HOST_TRIPLE] - update available: 1.1.0 (hash-beta-1.1.0) -> 1.2.0 (hash-beta-1.2.0)
+nightly-[HOST_TRIPLE] - update available: 1.2.0 (hash-nightly-1) -> 1.3.0 (hash-nightly-2)
 
 "#]]);
 }
@@ -276,9 +276,9 @@ async fn check_updates_with_update() {
             .await
             .is_err()
             .with_stdout(snapbox::str![[r#"
-stable-[HOST_TRIPLE] - Up to date : 1.0.0 (hash-stable-1.0.0)
-beta-[HOST_TRIPLE] - Up to date : 1.1.0 (hash-beta-1.1.0)
-nightly-[HOST_TRIPLE] - Up to date : 1.2.0 (hash-nightly-1)
+stable-[HOST_TRIPLE] - up to date: 1.0.0 (hash-stable-1.0.0)
+beta-[HOST_TRIPLE] - up to date: 1.1.0 (hash-beta-1.1.0)
+nightly-[HOST_TRIPLE] - up to date: 1.2.0 (hash-nightly-1)
 
 "#]]);
     }
@@ -289,9 +289,9 @@ nightly-[HOST_TRIPLE] - Up to date : 1.2.0 (hash-nightly-1)
         .await
         .is_ok()
         .with_stdout(snapbox::str![[r#"
-stable-[HOST_TRIPLE] - Update available : 1.0.0 (hash-stable-1.0.0) -> 1.1.0 (hash-stable-1.1.0)
-beta-[HOST_TRIPLE] - Update available : 1.1.0 (hash-beta-1.1.0) -> 1.2.0 (hash-beta-1.2.0)
-nightly-[HOST_TRIPLE] - Update available : 1.2.0 (hash-nightly-1) -> 1.3.0 (hash-nightly-2)
+stable-[HOST_TRIPLE] - update available: 1.0.0 (hash-stable-1.0.0) -> 1.1.0 (hash-stable-1.1.0)
+beta-[HOST_TRIPLE] - update available: 1.1.0 (hash-beta-1.1.0) -> 1.2.0 (hash-beta-1.2.0)
+nightly-[HOST_TRIPLE] - update available: 1.2.0 (hash-nightly-1) -> 1.3.0 (hash-nightly-2)
 
 "#]]);
     cx.config.expect(["rustup", "update", "beta"]).await.is_ok();
@@ -300,9 +300,9 @@ nightly-[HOST_TRIPLE] - Update available : 1.2.0 (hash-nightly-1) -> 1.3.0 (hash
         .await
         .is_ok()
         .with_stdout(snapbox::str![[r#"
-stable-[HOST_TRIPLE] - Update available : 1.0.0 (hash-stable-1.0.0) -> 1.1.0 (hash-stable-1.1.0)
-beta-[HOST_TRIPLE] - Up to date : 1.2.0 (hash-beta-1.2.0)
-nightly-[HOST_TRIPLE] - Update available : 1.2.0 (hash-nightly-1) -> 1.3.0 (hash-nightly-2)
+stable-[HOST_TRIPLE] - update available: 1.0.0 (hash-stable-1.0.0) -> 1.1.0 (hash-stable-1.1.0)
+beta-[HOST_TRIPLE] - up to date: 1.2.0 (hash-beta-1.2.0)
+nightly-[HOST_TRIPLE] - update available: 1.2.0 (hash-nightly-1) -> 1.3.0 (hash-nightly-2)
 
 "#]]);
 }
diff --git a/tests/suite/cli_rustup_ui/rustup_check_updates_none.stdout.term.svg b/tests/suite/cli_rustup_ui/rustup_check_updates_none.stdout.term.svg
@@ -18,11 +18,11 @@
   <rect width="100%" height="100%" y="0" rx="4.5" class="bg" />
 
   <text xml:space="preserve" class="container fg">
-    <tspan x="10px" y="28px"><tspan class="bold">stable-[HOST_TRIPLE] - </tspan><tspan class="fg-green bold">Up to date</tspan><tspan> : 1.1.0 (hash-stable-1.1.0)</tspan>
+    <tspan x="10px" y="28px"><tspan class="bold">stable-[HOST_TRIPLE] - </tspan><tspan class="fg-green bold">up to date</tspan><tspan>: 1.1.0 (hash-stable-1.1.0)</tspan>
 </tspan>
-    <tspan x="10px" y="46px"><tspan class="bold">beta-[HOST_TRIPLE] - </tspan><tspan class="fg-green bold">Up to date</tspan><tspan> : 1.2.0 (hash-beta-1.2.0)</tspan>
+    <tspan x="10px" y="46px"><tspan class="bold">beta-[HOST_TRIPLE] - </tspan><tspan class="fg-green bold">up to date</tspan><tspan>: 1.2.0 (hash-beta-1.2.0)</tspan>
 </tspan>
-    <tspan x="10px" y="64px"><tspan class="bold">nightly-[HOST_TRIPLE] - </tspan><tspan class="fg-green bold">Up to date</tspan><tspan> : 1.3.0 (hash-nightly-2)</tspan>
+    <tspan x="10px" y="64px"><tspan class="bold">nightly-[HOST_TRIPLE] - </tspan><tspan class="fg-green bold">up to date</tspan><tspan>: 1.3.0 (hash-nightly-2)</tspan>
 </tspan>
     <tspan x="10px" y="82px">
 </tspan>
diff --git a/tests/suite/cli_rustup_ui/rustup_check_updates_some.stdout.term.svg b/tests/suite/cli_rustup_ui/rustup_check_updates_some.stdout.term.svg
@@ -1,4 +1,4 @@
-<svg width="827px" height="92px" xmlns="http://www.w3.org/2000/svg">
+<svg width="818px" height="92px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
     .bg { fill: #000000 }
@@ -18,11 +18,11 @@
   <rect width="100%" height="100%" y="0" rx="4.5" class="bg" />
 
   <text xml:space="preserve" class="container fg">
-    <tspan x="10px" y="28px"><tspan class="bold">stable-[HOST_TRIPLE] - </tspan><tspan class="fg-yellow bold">Update available</tspan><tspan> : 1.0.0 (hash-stable-1.0.0) -&gt; 1.1.0 (hash-stable-1.1.0)</tspan>
+    <tspan x="10px" y="28px"><tspan class="bold">stable-[HOST_TRIPLE] - </tspan><tspan class="fg-yellow bold">update available</tspan><tspan>: 1.0.0 (hash-stable-1.0.0) -&gt; 1.1.0 (hash-stable-1.1.0)</tspan>
 </tspan>
-    <tspan x="10px" y="46px"><tspan class="bold">beta-[HOST_TRIPLE] - </tspan><tspan class="fg-yellow bold">Update available</tspan><tspan> : 1.1.0 (hash-beta-1.1.0) -&gt; 1.2.0 (hash-beta-1.2.0)</tspan>
+    <tspan x="10px" y="46px"><tspan class="bold">beta-[HOST_TRIPLE] - </tspan><tspan class="fg-yellow bold">update available</tspan><tspan>: 1.1.0 (hash-beta-1.1.0) -&gt; 1.2.0 (hash-beta-1.2.0)</tspan>
 </tspan>
-    <tspan x="10px" y="64px"><tspan class="bold">nightly-[HOST_TRIPLE] - </tspan><tspan class="fg-yellow bold">Update available</tspan><tspan> : 1.2.0 (hash-nightly-1) -&gt; 1.3.0 (hash-nightly-2)</tspan>
+    <tspan x="10px" y="64px"><tspan class="bold">nightly-[HOST_TRIPLE] - </tspan><tspan class="fg-yellow bold">update available</tspan><tspan>: 1.2.0 (hash-nightly-1) -&gt; 1.3.0 (hash-nightly-2)</tspan>
 </tspan>
     <tspan x="10px" y="82px">
 </tspan>
