Skip to content
Draft
2 changes: 1 addition & 1 deletion src/cli/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ fn show_channel_updates(
// this is a bit strange: we don't supply the version we
// presumably had (for Installed and Unchanged), so we query it
// again. Perhaps we can do better.
let version = match Toolchain::new(cfg, name.into()) {
let version = match Toolchain::new(cfg, name.clone().into()) {
Ok(t) => t.rustc_version(),
Err(_) => String::from("(toolchain not installed)"),
};
Expand Down
10 changes: 5 additions & 5 deletions src/cli/rustup_mode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -873,17 +873,17 @@ async fn default_(
cfg.set_default(None)?;
}
MaybeResolvableToolchainName::Some(ResolvableToolchainName::Custom(toolchain_name)) => {
Toolchain::new(cfg, (&toolchain_name).into())?;
Toolchain::new(cfg, toolchain_name.clone().into())?;
cfg.set_default(Some(&toolchain_name.into()))?;
}
MaybeResolvableToolchainName::Some(ResolvableToolchainName::Official(toolchain)) => {
let desc = toolchain.resolve(&cfg.default_host_tuple()?)?;
let desc = toolchain.clone().resolve(&cfg.default_host_tuple()?)?;
let status = cfg
.ensure_installed(&desc, vec![], vec![], None, force_non_host, true)
.await?
.status;

cfg.set_default(Some(&desc.clone().into()))?;
cfg.set_default(Some(&toolchain.into()))?;

writeln!(cfg.process.stdout().lock())?;

Expand Down Expand Up @@ -1082,7 +1082,7 @@ async fn update(
force_non_host,
)?;
}
let desc = name.resolve(&cfg.default_host_tuple()?)?;
let desc = name.clone().resolve(&cfg.default_host_tuple()?)?;

let components = opts.component.iter().map(|s| &**s).collect::<Vec<_>>();
let targets = opts.target.iter().map(|s| &**s).collect::<Vec<_>>();
Expand Down Expand Up @@ -1123,7 +1123,7 @@ async fn update(
}

if cfg.get_default()?.is_none() && matches!(status, UpdateStatus::Installed) {
cfg.set_default(Some(&desc.into()))?;
cfg.set_default(Some(&name.into()))?;
}
}
exit_code &= self_update_mode.update(should_self_update, &dl_cfg).await?;
Expand Down
Loading
Loading