Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/dist/manifest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,15 @@ impl Manifest {
&component.pkg
}
}

pub(crate) fn display_name(&self, component: &Component, host_target: &TargetTuple) -> String {
match &component.target {
Some(component_target) if *host_target == *component_target => {
self.short_name(component).to_owned()
}
_ => self.name(component),
}
}
}

#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
Expand Down
20 changes: 17 additions & 3 deletions src/dist/manifestation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,11 @@ impl Manifestation {
.iter()
// The same as the component name's length used in `ComponentBinary::new`
// As it's used for status output
.map(|component| new_manifest.short_name(component).len())
.map(|component| {
new_manifest
.display_name(component, &toolchain.target)
.len()
})
.max()
.unwrap_or(0)
.max(DEFAULT_MIN_NAME_WIDTH);
Expand All @@ -177,7 +181,13 @@ impl Manifestation {
.components_to_install
.into_iter()
.filter_map(|component| {
ComponentBinary::new(component, &new_manifest, download_cfg, max_name_width)
ComponentBinary::new(
component,
&new_manifest,
download_cfg,
max_name_width,
&toolchain.target,
)
})
.collect::<Result<Vec<_>>>()?;

Expand Down Expand Up @@ -766,14 +776,18 @@ impl<'a> ComponentBinary<'a> {
manifest: &'a Manifest,
download_cfg: &'a DownloadCfg<'a>,
name_width: usize,
host_toolchain_target: &TargetTuple,
) -> Option<Result<Self>> {
Some(Ok(ComponentBinary {
binary: match manifest.binary(&component) {
Ok(Some(b)) => b,
Ok(None) => return None,
Err(e) => return Some(Err(e)),
},
status: download_cfg.status_for(manifest.short_name(&component).to_owned(), name_width),
status: download_cfg.status_for(
manifest.display_name(&component, host_toolchain_target),
name_width,
),
component,
manifest,
download_cfg,
Expand Down
Loading