Merge pull request #2554 from kinnison/fix-2440

UX: Ensure 'skipping nightly' messages use rename table

Author: kinnison

src/dist/dist.rs

@@ -693,6 +693,11 @@ fn update_from_dist_<'a>(
         old_manifest
     };
 
+    let current_manifest = {
+        let manifestation = Manifestation::open(prefix.clone(), toolchain.target.clone())?;
+        manifestation.load_manifest()?
+    };
+
     loop {
         match try_update_from_dist_(
             download,
@@ -711,9 +716,13 @@ fn update_from_dist_<'a>(
                     break Err(e);
                 }
 
-                if let ErrorKind::RequestedComponentsUnavailable(components, ..) = e.kind() {
+                if let ErrorKind::RequestedComponentsUnavailable(components, manifest, ..) =
+                    e.kind()
+                {
                     (download.notify_handler)(Notification::SkippingNightlyMissingComponent(
-                        &toolchain, components,
+                        &toolchain,
+                        current_manifest.as_ref().unwrap_or(manifest),
+                        components,
                     ));
 
                     if first_err.is_none() {

src/dist/notifications.rs

@@ -7,6 +7,8 @@ use crate::utils::notify::NotificationLevel;
 use std::fmt::{self, Display};
 use std::path::Path;
 
+use super::manifest::Manifest;
+
 #[derive(Debug)]
 pub enum Notification<'a> {
     Utils(crate::utils::Notification<'a>),
@@ -31,7 +33,7 @@ pub enum Notification<'a> {
     DownloadingManifest(&'a str),
     DownloadedManifest(&'a str, Option<&'a str>),
     DownloadingLegacyManifest,
-    SkippingNightlyMissingComponent(&'a ToolchainDesc, &'a [Component]),
+    SkippingNightlyMissingComponent(&'a ToolchainDesc, &'a Manifest, &'a [Component]),
     ForcingUnavailableComponent(&'a str),
     ManifestChecksumFailedHack,
     ComponentUnavailable(&'a str, Option<&'a TargetTriple>),
@@ -72,7 +74,7 @@ impl<'a> Notification<'a> {
             | ManifestChecksumFailedHack
             | RollingBack
             | DownloadingManifest(_)
-            | SkippingNightlyMissingComponent(_, _)
+            | SkippingNightlyMissingComponent(_, _, _)
             | RetryingDownload(_)
             | DownloadedManifest(_, _) => NotificationLevel::Info,
             CantReadUpdateHash(_)
@@ -174,17 +176,17 @@ impl<'a> Display for Notification<'a> {
                 "removing stray hash found at '{}' in order to continue",
                 path.display()
             ),
-            SkippingNightlyMissingComponent(toolchain, components) => write!(
+            SkippingNightlyMissingComponent(toolchain, manifest, components) => write!(
                 f,
                 "skipping nightly which is missing installed component{} '{}'",
                 if components.len() > 1 { "s" } else { "" },
                 components
                     .iter()
                     .map(|component| {
                         if component.target.as_ref() != Some(&toolchain.target) {
-                            component.name_in_manifest()
+                            component.name(manifest)
                         } else {
-                            component.short_name_in_manifest().to_owned()
+                            component.short_name(manifest).to_owned()
                         }
                     })
                     .collect::<Vec<_>>()

tests/mock/clitools.rs

@@ -818,8 +818,10 @@ fn create_mock_dist_server(path: &Path, s: Scenario) {
             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-12", "1")
+                .multi_arch()
+                .with_rls(RlsStatus::Renamed),
+            Release::new("nightly", "1.37.0", "2019-09-13", "2").with_rls(RlsStatus::Renamed),
             Release::new("nightly", "1.37.0", "2019-09-14", "3")
                 .multi_arch()
                 .with_rls(RlsStatus::Unavailable),