Skip to content

Improve performance - skip manifest read if no components/targets requested #2917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Improve performance - skip manifest read if no components/targets requested #2917

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 6 additions & 9 deletions src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,9 @@ impl Cfg {
components: &[&str],
targets: &[&str],
) -> Result<bool> {
let components_requested = !components.is_empty() || !targets.is_empty();
if components.is_empty() && targets.is_empty() {
return Ok(true);
}
// If we're here, the toolchain exists on disk and is a dist toolchain
// so we should attempt to load its manifest
let desc = if let Some(desc) = distributable.get_toolchain_desc_with_manifest()? {
Expand All @@ -747,11 +749,8 @@ impl Cfg {
// at re-fetching the manifest to try again.
return Ok(distributable.guess_v1_manifest());
};
match (desc.list_components(), components_requested) {
// If the toolchain does not support components but there were components requested, bubble up the error
(Err(e), true) => Err(e),
// Otherwise check if all the components we want are installed
(Ok(installed_components), _) => Ok(components.iter().all(|name| {
let installed_components = desc.list_components()?;
Ok(components.iter().all(|name| {
installed_components.iter().any(|status| {
let cname = status.component.short_name(&desc.manifest);
let cname = cname.as_str();
Expand All @@ -769,9 +768,7 @@ impl Cfg {
let ctarg = status.component.target();
(ctarg == *name) && status.installed
})
})),
_ => Ok(true),
}
}))
}

if let Some((toolchain, components, targets, reason, profile)) =
Expand Down