feat(config)!: use unqualified names for default_toolchain

Author: rami3l

src/cli/rustup_mode.rs

@@ -877,13 +877,13 @@ async fn default_(
                 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())?;
 
@@ -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<_>>();
@@ -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?;

src/cli/self_update.rs

@@ -269,7 +269,7 @@ impl InstallOpts<'_> {
 
             check_proxy_sanity(cfg.process, components, &desc)?;
 
-            cfg.set_default(Some(&desc.clone().into()))?;
+            cfg.set_default(Some(&partial_desc.into()))?;
             writeln!(cfg.process.stdout().lock())?;
             common::show_channel_update(cfg, PackageUpdate::Toolchain(desc), Ok(status))?;
         }

src/config.rs

@@ -384,7 +384,7 @@ impl<'a> Cfg<'a> {
         Ok(cfg)
     }
 
-    pub(crate) fn set_default(&self, toolchain: Option<&ToolchainName>) -> Result<()> {
+    pub(crate) fn set_default(&self, toolchain: Option<&ResolvableToolchainName>) -> Result<()> {
         self.settings_file.with_mut(|s| {
             s.default_toolchain = toolchain.map(|t| t.to_string());
             Ok(())

src/toolchain/names.rs

@@ -304,6 +304,17 @@ impl ResolvableLocalToolchainName {
     }
 }
 
+from_variant!(
+    PartialToolchainDesc,
+    ResolvableToolchainName,
+    ResolvableToolchainName::Official
+);
+from_variant!(
+    CustomToolchainName,
+    ResolvableToolchainName,
+    ResolvableToolchainName::Custom
+);
+
 try_from_str!(ResolvableLocalToolchainName);
 
 impl Display for ResolvableLocalToolchainName {

tests/suite/cli_exact.rs

@@ -23,7 +23,7 @@ async fn update_once() {
 info: syncing channel updates for nightly-[HOST_TUPLE]
 info: latest update on 2015-01-02 for version 1.3.0 (hash-nightly-2)
 info: downloading 4 components
-info: default toolchain set to nightly-[HOST_TUPLE]
+info: default toolchain set to nightly
 
 "#]]);
     cx.config
@@ -322,7 +322,7 @@ async fn default() {
 info: syncing channel updates for nightly-[HOST_TUPLE]
 info: latest update on 2015-01-02 for version 1.3.0 (hash-nightly-2)
 info: downloading 4 components
-info: default toolchain set to nightly-[HOST_TUPLE]
+info: default toolchain set to nightly
 
 "#]]);
     cx.config

tests/suite/cli_rustup.rs

@@ -290,7 +290,7 @@ async fn default() {
 info: syncing channel updates for nightly-[HOST_TUPLE]
 info: latest update on 2015-01-02 for version 1.3.0 (hash-nightly-2)
 info: downloading 4 components
-info: default toolchain set to nightly-[HOST_TUPLE]
+info: default toolchain set to nightly
 
 "#]])
         .is_ok();
@@ -327,7 +327,7 @@ async fn default_override() {
         .await
         .with_stderr(snapbox::str![[r#"
 info: using existing install for stable-[HOST_TUPLE]
-info: default toolchain set to stable-[HOST_TUPLE]
+info: default toolchain set to stable
 info: note that the toolchain 'nightly-[HOST_TUPLE]' is currently in use (directory override for '[..]')
 
 "#]])
@@ -4032,7 +4032,7 @@ async fn custom_toolchain_with_components_toolchains_profile_does_not_err() {
 info: syncing channel updates for nightly-[HOST_TUPLE]
 info: latest update on 2015-01-02 for version 1.3.0 (hash-nightly-2)
 info: downloading 2 components
-info: default toolchain set to nightly-[HOST_TUPLE]
+info: default toolchain set to nightly
 
 "#]])
         .is_ok();

tests/suite/cli_rustup_ui/rustup_default.stderr.term.svg

@@ -74,7 +74,7 @@ async fn install_bins_to_cargo_home() {
 info: syncing channel updates for stable-[HOST_TUPLE]
 info: latest update on 2015-01-02 for version 1.1.0 (hash-stable-1.1.0)
 info: downloading 4 components
-info: default toolchain set to stable-[HOST_TUPLE]
+info: default toolchain set to stable
 
 "#]])
         .is_ok();
@@ -118,7 +118,7 @@ async fn proxies_are_relative_symlinks() {
 info: syncing channel updates for stable-[HOST_TUPLE]
 info: latest update on 2015-01-02 for version 1.1.0 (hash-stable-1.1.0)
 info: downloading 4 components
-info: default toolchain set to stable-[HOST_TUPLE]
+info: default toolchain set to stable
 ...
 "#]])
         .is_ok();
@@ -974,7 +974,7 @@ async fn reinstall_specifying_different_toolchain() {
         .await
         .with_stderr(snapbox::str![[r#"
 ...
-info: default toolchain set to nightly-[HOST_TUPLE]
+info: default toolchain set to nightly
 ...
 "#]])
         .is_ok();