Log versions during self updates

Author: djc

src/cli/self_update.rs

@@ -1138,7 +1138,7 @@ pub(crate) async fn prepare_update(process: &Process) -> Result<Option<PathBuf>>
     let current_version = env!("CARGO_PKG_VERSION");
 
     // Get available version
-    info!("checking for self-update");
+    info!("checking for self-update (current version: {current_version})");
     let available_version = if let Some(ver) = non_empty_env_var("RUSTUP_VERSION", process)? {
         info!("`RUSTUP_VERSION` has been set to `{ver}`");
         ver
@@ -1158,7 +1158,7 @@ pub(crate) async fn prepare_update(process: &Process) -> Result<Option<PathBuf>>
     let download_url = utils::parse_url(&url)?;
 
     // Download new version
-    info!("downloading self-update");
+    info!("downloading self-update (new version: {available_version})");
     download_file(&download_url, &setup_path, None, &|_| (), process).await?;
 
     // Mark as executable

tests/suite/cli_exact.rs

@@ -83,6 +83,7 @@ info: installing component 'rustc'
 #[tokio::test]
 async fn update_once_and_self_update() {
     let test_version = "2.0.0";
+    let current = env!("CARGO_PKG_VERSION");
     let mut cx = CliTestContext::new(Scenario::SimpleV2).await;
     let _dist_guard = cx.with_update_server(test_version);
     cx.config
@@ -111,8 +112,8 @@ info: installing component 'cargo'
 info: installing component 'rust-docs'
 info: installing component 'rust-std'
 info: installing component 'rustc'
-info: checking for self-update
-info: downloading self-update
+info: checking for self-update (current version: {current})
+info: downloading self-update (new version: 2.0.0)
 "
             ),
         )

tests/suite/cli_self_upd.rs

@@ -367,10 +367,11 @@ struct GcErr(Vec<String>);
 #[tokio::test]
 async fn update_exact() {
     let version = env!("CARGO_PKG_VERSION");
-    let expected_output = "info: checking for self-update
-info: downloading self-update
+    let expected_output = format!(
+        "info: checking for self-update (current version: {version})
+info: downloading self-update (new version: {TEST_VERSION})
 "
-    .to_string();
+    );
 
     let mut cx = SelfUpdateTestContext::new(TEST_VERSION).await;
     cx.config
@@ -389,9 +390,9 @@ info: downloading self-update
 async fn update_precise() {
     let version = env!("CARGO_PKG_VERSION");
     let expected_output = format!(
-        "info: checking for self-update
+        "info: checking for self-update (current version: {version})
 info: `RUSTUP_VERSION` has been set to `{TEST_VERSION}`
-info: downloading self-update
+info: downloading self-update (new version: {TEST_VERSION})
 "
     );
 
@@ -563,8 +564,10 @@ async fn update_no_change() {
 
 "
             ),
-            r"info: checking for self-update
-",
+            &format!(
+                r"info: checking for self-update (current version: {version})
+"
+            ),
         )
         .await;
 }
@@ -628,6 +631,7 @@ async fn rustup_no_self_update_with_specified_toolchain() {
 
 #[tokio::test]
 async fn rustup_self_update_exact() {
+    let version = env!("CARGO_PKG_VERSION");
     let mut cx = SelfUpdateTestContext::new(TEST_VERSION).await;
     cx.config
         .expect_ok(&["rustup", "set", "auto-self-update", "enable"])
@@ -647,8 +651,8 @@ async fn rustup_self_update_exact() {
             ),
             for_host!(
                 r"info: syncing channel updates for 'stable-{0}'
-info: checking for self-update
-info: downloading self-update
+info: checking for self-update (current version: {version})
+info: downloading self-update (new version: {TEST_VERSION})
 info: cleaning up downloads & tmp directories
 "
             ),