Skip to content

Commit c0cf0ab

Browse files
committed
feat(config)!: add verbose flag to find_or_install_active_toolchain()
1 parent d7cd595 commit c0cf0ab

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

src/config.rs

+9-6
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ impl<'a> Cfg<'a> {
510510
LocalToolchainName::Named(ToolchainName::Official(desc)),
511511
)?)
512512
}
513-
None => Ok(self.find_or_install_active_toolchain().await?.0),
513+
None => Ok(self.find_or_install_active_toolchain(false).await?.0),
514514
}
515515
}
516516

@@ -718,7 +718,7 @@ impl<'a> Cfg<'a> {
718718
let desc = name.resolve(&self.get_default_host_triple()?)?;
719719
Toolchain::new(self, desc.into())?
720720
}
721-
None => self.find_or_install_active_toolchain().await?.0,
721+
None => self.find_or_install_active_toolchain(false).await?.0,
722722
})
723723
}
724724

@@ -732,12 +732,15 @@ impl<'a> Cfg<'a> {
732732

733733
Ok(match local {
734734
Some(tc) => Toolchain::from_local(tc, false, self).await?,
735-
None => self.find_or_install_active_toolchain().await?.0,
735+
None => self.find_or_install_active_toolchain(false).await?.0,
736736
})
737737
}
738738

739739
#[tracing::instrument(level = "trace", skip_all)]
740-
async fn find_or_install_active_toolchain(&'a self) -> Result<(Toolchain<'a>, ActiveReason)> {
740+
async fn find_or_install_active_toolchain(
741+
&'a self,
742+
verbose: bool,
743+
) -> Result<(Toolchain<'a>, ActiveReason)> {
741744
match self.find_override_config()? {
742745
Some((override_config, reason)) => match override_config {
743746
OverrideCfg::PathBased(path_based_name) => {
@@ -755,7 +758,7 @@ impl<'a> Cfg<'a> {
755758
profile,
756759
} => {
757760
let toolchain = self
758-
.ensure_installed(&toolchain, components, targets, profile, false)
761+
.ensure_installed(&toolchain, components, targets, profile, verbose)
759762
.await?
760763
.1;
761764
Ok((toolchain, reason))
@@ -771,7 +774,7 @@ impl<'a> Cfg<'a> {
771774
Some(ToolchainName::Official(toolchain_desc)) => {
772775
let reason = ActiveReason::Default;
773776
let toolchain = self
774-
.ensure_installed(&toolchain_desc, vec![], vec![], None, false)
777+
.ensure_installed(&toolchain_desc, vec![], vec![], None, verbose)
775778
.await?
776779
.1;
777780
Ok((toolchain, reason))

0 commit comments

Comments
 (0)