Add component name when target is not equal to host

Author: LeSeulArtichaut

src/dist/dist.rs

@@ -689,7 +689,7 @@ fn update_from_dist_<'a>(
 
                 if let ErrorKind::RequestedComponentsUnavailable(components, ..) = e.kind() {
                     (download.notify_handler)(Notification::SkippingNightlyMissingComponent(
-                        components,
+                        &toolchain, components,
                     ));
 
                     if first_err.is_none() {

src/dist/notifications.rs

@@ -1,5 +1,5 @@
 use crate::config::PgpPublicKey;
-use crate::dist::dist::TargetTriple;
+use crate::dist::dist::{TargetTriple, ToolchainDesc};
 use crate::dist::manifest::Component;
 use crate::dist::temp;
 use crate::errors::*;
@@ -31,7 +31,7 @@ pub enum Notification<'a> {
     DownloadingManifest(&'a str),
     DownloadedManifest(&'a str, Option<&'a str>),
     DownloadingLegacyManifest,
-    SkippingNightlyMissingComponent(&'a [Component]),
+    SkippingNightlyMissingComponent(&'a ToolchainDesc, &'a [Component]),
     ForcingUnavailableComponent(&'a str),
     ManifestChecksumFailedHack,
     ComponentUnavailable(&'a str, Option<&'a TargetTriple>),
@@ -72,7 +72,7 @@ impl<'a> Notification<'a> {
             | ManifestChecksumFailedHack
             | RollingBack
             | DownloadingManifest(_)
-            | SkippingNightlyMissingComponent(_)
+            | SkippingNightlyMissingComponent(_, _)
             | RetryingDownload(_)
             | DownloadedManifest(_, _) => NotificationLevel::Info,
             CantReadUpdateHash(_)
@@ -174,13 +174,19 @@ impl<'a> Display for Notification<'a> {
                 "removing stray hash found at '{}' in order to continue",
                 path.display()
             ),
-            SkippingNightlyMissingComponent(components) => write!(
+            SkippingNightlyMissingComponent(toolchain, components) => write!(
                 f,
                 "skipping nightly which is missing installed component{} '{}'",
                 if components.len() > 1 { "s" } else { "" },
                 components
                     .iter()
-                    .map(|component| component.short_name_in_manifest().to_owned())
+                    .map(|component| {
+                        if component.target.as_ref() != Some(&toolchain.target) {
+                            component.name_in_manifest().to_owned()
+                        } else {
+                            component.short_name_in_manifest().to_owned()
+                        }
+                    })
                     .collect::<Vec<_>>()
                     .join("', '")
             ),

tests/cli-exact.rs

@@ -533,3 +533,62 @@ fn install_by_version_number() {
         expect_ok(config, &["rustup", "default", "0.100.99"]);
     })
 }
+
+// issue #2191
+#[test]
+fn install_unreleased_component() {
+    clitools::setup(Scenario::MissingComponentMulti, &|config| {
+        // Initial channel content is host + rls + multiarch-std
+        set_current_dist_date(config, "2019-09-12");
+        expect_ok(config, &["rustup", "default", "nightly"]);
+        expect_ok(config, &["rustup", "component", "add", "rls"]);
+        expect_ok(config, &["rustup", "target", "add", clitools::MULTI_ARCH1]);
+
+        // Next channel variant should have host + rls but not multiarch-std
+        set_current_dist_date(config, "2019-09-13");
+        expect_ok_ex(
+            config,
+            &["rustup", "update", "nightly", "--no-self-update"],
+            &for_host!(
+                r"
+  nightly-{} unchanged - 1.37.0 (hash-nightly-1)
+
+"
+            ),
+            &format!(
+                r"info: syncing channel updates for 'nightly-{0}'
+info: latest update on 2019-09-13, rust version 1.37.0 (hash-nightly-2)
+info: skipping nightly which is missing installed component 'rust-std-{1}'
+info: syncing channel updates for 'nightly-2019-09-12-{0}'
+",
+                clitools::this_host_triple(),
+                clitools::MULTI_ARCH1
+            ),
+        );
+
+        // Next channel variant should have host + multiarch-std but have rls missing
+        set_current_dist_date(config, "2019-09-14");
+        expect_ok_ex(
+            config,
+            &["rustup", "update", "nightly", "--no-self-update"],
+            &for_host!(
+                r"
+  nightly-{} unchanged - 1.37.0 (hash-nightly-1)
+
+"
+            ),
+            &format!(
+                r"info: syncing channel updates for 'nightly-{0}'
+info: latest update on 2019-09-14, rust version 1.37.0 (hash-nightly-3)
+info: skipping nightly which is missing installed component 'rls'
+info: syncing channel updates for 'nightly-2019-09-13-{0}'
+info: latest update on 2019-09-13, rust version 1.37.0 (hash-nightly-2)
+info: skipping nightly which is missing installed component 'rust-std-{1}'
+info: syncing channel updates for 'nightly-2019-09-12-{0}'
+",
+                clitools::this_host_triple(),
+                clitools::MULTI_ARCH1,
+            ),
+        );
+    })
+}

tests/mock/clitools.rs

@@ -66,6 +66,9 @@ pub enum Scenario {
     MissingNightly,
     /// Two dates, v2 manifests, host and MULTI_ARCH1 in first, host not in second
     HostGoesMissing,
+    /// Three dates, v2 manifests, host and MULTI_ARCH1 in first, host only in second,
+    /// host and MULTI_ARCH1 but no RLS in last
+    MissingComponentMulti,
 }
 
 pub static CROSS_ARCH1: &str = "x86_64-unknown-linux-musl";
@@ -684,6 +687,13 @@ fn create_mock_dist_server(path: &Path, s: Scenario) {
             Release::new("nightly", "1.3.0", "2019-12-09", "1"),
             Release::new("nightly", "1.3.0", "2019-12-10", "2").only_multi_arch(),
         ],
+        Scenario::MissingComponentMulti => vec![
+            Release::new("nightly", "1.37.0", "2019-09-12", "1").multi_arch(),
+            Release::new("nightly", "1.37.0", "2019-09-13", "2"),
+            Release::new("nightly", "1.37.0", "2019-09-14", "3")
+                .multi_arch()
+                .with_rls(RlsStatus::Unavailable),
+        ],
     };
 
     let vs = match s {
@@ -696,7 +706,8 @@ fn create_mock_dist_server(path: &Path, s: Scenario) {
         | Scenario::UnavailableRls
         | Scenario::MissingNightly
         | Scenario::HostGoesMissing
-        | Scenario::MissingComponent => vec![ManifestVersion::V2],
+        | Scenario::MissingComponent
+        | Scenario::MissingComponentMulti => vec![ManifestVersion::V2],
     };
 
     MockDistServer {