Yield references from Manifest::short_name()

Author: djc

src/dist/manifest.rs

@@ -56,7 +56,7 @@ impl Manifest {
         if let Some(t) = &component.target {
             format!("{pkg}-{t}")
         } else {
-            pkg
+            pkg.to_owned()
         }
     }
 
@@ -69,11 +69,11 @@ impl Manifest {
         }
     }
 
-    pub(crate) fn short_name(&self, component: &Component) -> String {
+    pub(crate) fn short_name<'a>(&'a self, component: &'a Component) -> &'a str {
         if let Some(from) = self.reverse_renames.get(&component.pkg) {
-            from.to_owned()
+            from
         } else {
-            component.pkg.clone()
+            &component.pkg
         }
     }
 }
@@ -380,12 +380,12 @@ impl Manifest {
 
     fn validate_targeted_package(&self, tpkg: &TargetedPackage) -> Result<()> {
         for c in tpkg.components.iter() {
-            let cpkg = self
-                .get_package(&c.pkg)
-                .with_context(|| RustupError::MissingPackageForComponent(self.short_name(c)))?;
-            let _ctpkg = cpkg
-                .get_target(c.target.as_ref())
-                .with_context(|| RustupError::MissingPackageForComponent(self.short_name(c)))?;
+            let cpkg = self.get_package(&c.pkg).with_context(|| {
+                RustupError::MissingPackageForComponent(self.short_name(c).to_owned())
+            })?;
+            let _ctpkg = cpkg.get_target(c.target.as_ref()).with_context(|| {
+                RustupError::MissingPackageForComponent(self.short_name(c).to_owned())
+            })?;
         }
         Ok(())
     }

src/dist/manifestation.rs

@@ -634,7 +634,7 @@ impl<'a> ComponentBinary<'a> {
                 Ok(None) => return None,
                 Err(e) => return Some(Err(e)),
             },
-            status: download_cfg.status_for(manifest.short_name(&component)),
+            status: download_cfg.status_for(manifest.short_name(&component).to_owned()),
             component,
             manifest,
             download_cfg,
@@ -699,7 +699,7 @@ impl<'a> ComponentBinary<'a> {
         // If the package doesn't contain the component that the
         // manifest says it does then somebody must be playing a joke on us.
         if !package.contains(&pkg_name, Some(short_pkg_name)) {
-            return Err(RustupError::CorruptComponent(short_name).into());
+            return Err(RustupError::CorruptComponent(short_name.to_owned()).into());
         }
 
         let tx = package.install(

src/dist/mod.rs

@@ -1048,7 +1048,7 @@ impl<'cfg, 'a> DistOptions<'cfg, 'a> {
                         .iter()
                         .map(|component| {
                             match component.target.as_ref() == Some(&toolchain.target) {
-                                true => manifest.short_name(component),
+                                true => manifest.short_name(component).to_owned(),
                                 false => manifest.name(component),
                             }
                         })

src/toolchain/distributable.rs

@@ -170,7 +170,6 @@ impl<'a> DistributableToolchain<'a> {
         let wanted_components = components.iter().all(|name| {
             installed_components.iter().any(|status| {
                 let cname = manifest.short_name(&status.component);
-                let cname = cname.as_str();
                 let cnameim = status.component.short_name_in_manifest();
                 let cnameim = cnameim.as_str();
                 (cname == *name || cnameim == *name) && status.installed
@@ -284,7 +283,9 @@ impl<'a> DistributableToolchain<'a> {
                 .expect("There should be always at least one component");
 
             let mut closest_distance = short_name_distance;
-            let mut closest_match = manifest.short_name(&short_name_distance.1.component);
+            let mut closest_match = manifest
+                .short_name(&short_name_distance.1.component)
+                .to_owned();
 
             // Find closer suggestion
             if short_name_distance.0 > long_name_distance.0 {