Rename desc fields to toolchain

Author: djc

src/dist/mod.rs

@@ -713,7 +713,7 @@ impl fmt::Display for Profile {
 #[derive(Clone)]
 pub(crate) struct DistOptions<'a> {
     pub(crate) cfg: &'a Cfg<'a>,
-    pub(crate) desc: &'a ToolchainDesc,
+    pub(crate) toolchain: &'a ToolchainDesc,
     pub(crate) profile: Profile,
     pub(crate) update_hash: Option<&'a Path>,
     pub(crate) dl_cfg: DownloadCfg<'a>,
@@ -752,9 +752,9 @@ pub(crate) async fn update_from_dist(
 
     let mut fetched = String::new();
     let mut first_err = None;
-    let backtrack = opts.desc.channel == "nightly" && opts.desc.date.is_none();
+    let backtrack = opts.toolchain.channel == "nightly" && opts.toolchain.date.is_none();
     // We want to limit backtracking if we do not already have a toolchain
-    let mut backtrack_limit: Option<i32> = if opts.desc.date.is_some() {
+    let mut backtrack_limit: Option<i32> = if opts.toolchain.date.is_some() {
         None
     } else {
         // We limit the backtracking to 21 days by default (half a release cycle).
@@ -792,11 +792,11 @@ pub(crate) async fn update_from_dist(
     };
 
     let current_manifest = {
-        let manifestation = Manifestation::open(prefix.clone(), opts.desc.target.clone())?;
+        let manifestation = Manifestation::open(prefix.clone(), opts.toolchain.target.clone())?;
         manifestation.load_manifest()?
     };
 
-    let mut toolchain = opts.desc.clone();
+    let mut toolchain = opts.toolchain.clone();
     let res = loop {
         let result = try_update_from_dist_(
             opts.dl_cfg,

src/install.rs

@@ -132,7 +132,9 @@ impl<'a> InstallMethod<'a> {
         match self {
             InstallMethod::Copy { dest, .. } => (*dest).into(),
             InstallMethod::Link { dest, .. } => (*dest).into(),
-            InstallMethod::Dist(DistOptions { desc, .. }) => (*desc).into(),
+            InstallMethod::Dist(DistOptions {
+                toolchain: desc, ..
+            }) => (*desc).into(),
         }
     }
 
@@ -144,9 +146,11 @@ impl<'a> InstallMethod<'a> {
         match self {
             InstallMethod::Copy { cfg, dest, .. } => cfg.toolchain_path(&(*dest).into()),
             InstallMethod::Link { cfg, dest, .. } => cfg.toolchain_path(&(*dest).into()),
-            InstallMethod::Dist(DistOptions { cfg, desc, .. }) => {
-                cfg.toolchain_path(&(*desc).into())
-            }
+            InstallMethod::Dist(DistOptions {
+                cfg,
+                toolchain: desc,
+                ..
+            }) => cfg.toolchain_path(&(*desc).into()),
         }
     }
 }

src/toolchain/distributable.rs

@@ -327,18 +327,18 @@ impl<'a> DistributableToolchain<'a> {
     #[cfg_attr(feature = "otel", tracing::instrument(err, skip_all))]
     pub(crate) async fn install(
         cfg: &'a Cfg<'a>,
-        desc: &ToolchainDesc,
+        toolchain: &ToolchainDesc,
         components: &[&str],
         targets: &[&str],
         profile: Profile,
         force: bool,
     ) -> anyhow::Result<(UpdateStatus, DistributableToolchain<'a>)> {
-        let hash_path = cfg.get_hash_file(desc, true)?;
+        let hash_path = cfg.get_hash_file(toolchain, true)?;
         let update_hash = Some(&hash_path as &Path);
 
         let status = InstallMethod::Dist(DistOptions {
             cfg,
-            desc,
+            toolchain,
             profile,
             update_hash,
             dl_cfg: cfg.download_cfg(&|n| (cfg.notify_handler)(n.into())),
@@ -351,7 +351,7 @@ impl<'a> DistributableToolchain<'a> {
         })
         .install()
         .await?;
-        Ok((status, Self::new(cfg, desc.clone())?))
+        Ok((status, Self::new(cfg, toolchain.clone())?))
     }
 
     #[cfg_attr(feature = "otel", tracing::instrument(err, skip_all))]
@@ -414,7 +414,7 @@ impl<'a> DistributableToolchain<'a> {
 
         InstallMethod::Dist(DistOptions {
             cfg,
-            desc: &self.desc,
+            toolchain: &self.desc,
             profile,
             update_hash,
             dl_cfg: cfg.download_cfg(&|n| (cfg.notify_handler)(n.into())),