Privatize internal organization of toolchain module

Author: djc

src/cli/common.rs

@@ -16,17 +16,15 @@ use tracing::{debug, error, info, trace, warn};
 use super::self_update;
 use crate::cli::download_tracker::DownloadTracker;
 use crate::currentprocess::{terminalsource, Process};
-use crate::dist::{manifest::ComponentStatus, TargetTriple, ToolchainDesc};
+use crate::dist::{
+    manifest::ComponentStatus, notifications as dist_notifications, TargetTriple, ToolchainDesc,
+};
 use crate::install::UpdateStatus;
-use crate::toolchain::names::{LocalToolchainName, ToolchainName};
-use crate::toolchain::toolchain::Toolchain;
+use crate::toolchain::{DistributableToolchain, LocalToolchainName, Toolchain, ToolchainName};
 use crate::utils::notifications as util_notifications;
 use crate::utils::notify::NotificationLevel;
 use crate::utils::utils;
 use crate::{config::Cfg, notifications::Notification};
-use crate::{
-    dist::notifications as dist_notifications, toolchain::distributable::DistributableToolchain,
-};
 
 pub(crate) const WARN_COMPLETE_PROFILE: &str = "downloading with complete profile isn't recommended unless you are a developer of the rust language";
 

src/cli/proxy_mode.rs

@@ -6,7 +6,7 @@ use crate::{
     cli::{common::set_globals, job, self_update},
     command::run_command_for_dir,
     currentprocess::Process,
-    toolchain::names::ResolvableLocalToolchainName,
+    toolchain::ResolvableLocalToolchainName,
 };
 
 #[cfg_attr(feature = "otel", tracing::instrument)]

src/cli/rustup_mode.rs

@@ -31,12 +31,9 @@ use crate::{
     errors::RustupError,
     install::{InstallMethod, UpdateStatus},
     toolchain::{
-        distributable::DistributableToolchain,
-        names::{
-            CustomToolchainName, LocalToolchainName, MaybeResolvableToolchainName,
-            ResolvableLocalToolchainName, ResolvableToolchainName, ToolchainName,
-        },
-        toolchain::Toolchain,
+        CustomToolchainName, DistributableToolchain, LocalToolchainName,
+        MaybeResolvableToolchainName, ResolvableLocalToolchainName, ResolvableToolchainName,
+        Toolchain, ToolchainName,
     },
     utils::utils::{self, ExitCode},
 };
@@ -827,16 +824,13 @@ async fn update(cfg: &mut Cfg<'_>, opts: UpdateOpts) -> Result<utils::ExitCode>
             let force = opts.force;
             let allow_downgrade = opts.allow_downgrade;
             let profile = cfg.get_profile()?;
-            let status = match crate::toolchain::distributable::DistributableToolchain::new(
-                cfg,
-                desc.clone(),
-            ) {
+            let status = match DistributableToolchain::new(cfg, desc.clone()) {
                 Ok(mut d) => {
                     d.update_extra(&components, &targets, profile, force, allow_downgrade)
                         .await?
                 }
                 Err(RustupError::ToolchainNotInstalled(_)) => {
-                    crate::toolchain::distributable::DistributableToolchain::install(
+                    DistributableToolchain::install(
                         cfg,
                         &desc,
                         &components,

src/cli/self_update.rs

@@ -75,9 +75,8 @@ use crate::{
     errors::RustupError,
     install::UpdateStatus,
     toolchain::{
-        distributable::DistributableToolchain,
-        names::{MaybeOfficialToolchainName, ResolvableToolchainName, ToolchainName},
-        toolchain::Toolchain,
+        DistributableToolchain, MaybeOfficialToolchainName, ResolvableToolchainName, Toolchain,
+        ToolchainName,
     },
     utils::{utils, Notification},
     DUP_TOOLS, TOOLS,

src/cli/setup_mode.rs

@@ -11,7 +11,7 @@ use crate::{
     },
     currentprocess::Process,
     dist::Profile,
-    toolchain::names::MaybeOfficialToolchainName,
+    toolchain::MaybeOfficialToolchainName,
     utils::utils,
 };
 

src/config.rs

@@ -21,12 +21,8 @@ use crate::{
     notifications::*,
     settings::{MetadataVersion, Settings, SettingsFile},
     toolchain::{
-        distributable::DistributableToolchain,
-        names::{
-            CustomToolchainName, LocalToolchainName, PathBasedToolchainName,
-            ResolvableLocalToolchainName, ResolvableToolchainName, ToolchainName,
-        },
-        toolchain::Toolchain,
+        CustomToolchainName, DistributableToolchain, LocalToolchainName, PathBasedToolchainName,
+        ResolvableLocalToolchainName, ResolvableToolchainName, Toolchain, ToolchainName,
     },
     utils::utils,
 };
@@ -871,7 +867,7 @@ impl<'a> Cfg<'a> {
                 .filter_map(|n| ToolchainName::try_from(&n).ok())
                 .collect();
 
-            crate::toolchain::names::toolchain_sort(&mut toolchains);
+            crate::toolchain::toolchain_sort(&mut toolchains);
 
             Ok(toolchains)
         } else {

src/dist/manifest.rs

@@ -24,7 +24,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     dist::{config::Config, Profile, TargetTriple, ToolchainDesc},
     errors::*,
-    toolchain::distributable::DistributableToolchain,
+    toolchain::DistributableToolchain,
 };
 
 /// Used by the `installed_components` function

src/dist/mod.rs

@@ -11,9 +11,7 @@ use regex::Regex;
 use serde::{Deserialize, Serialize};
 use thiserror::Error as ThisError;
 
-use crate::{
-    currentprocess::Process, errors::RustupError, toolchain::names::ToolchainName, utils::utils,
-};
+use crate::{currentprocess::Process, errors::RustupError, toolchain::ToolchainName, utils::utils};
 
 pub mod component;
 pub(crate) mod config;

src/errors.rs

@@ -11,9 +11,11 @@ use thiserror::Error as ThisError;
 use url::Url;
 
 use crate::{
-    dist::manifest::{Component, Manifest},
-    dist::{TargetTriple, ToolchainDesc},
-    toolchain::names::{PathBasedToolchainName, ToolchainName},
+    dist::{
+        manifest::{Component, Manifest},
+        {TargetTriple, ToolchainDesc},
+    },
+    toolchain::{PathBasedToolchainName, ToolchainName},
 };
 
 /// A type erasing thunk for the retry crate to permit use with anyhow. See <https://github.com/dtolnay/anyhow/issues/149>

src/install.rs

@@ -9,10 +9,7 @@ use crate::{
     dist::{self, download::DownloadCfg, prefix::InstallPrefix, Notification},
     errors::RustupError,
     notifications::Notification as RootNotification,
-    toolchain::{
-        names::{CustomToolchainName, LocalToolchainName},
-        toolchain::Toolchain,
-    },
+    toolchain::{CustomToolchainName, LocalToolchainName, Toolchain},
     utils::utils,
 };
 

src/notifications.rs

@@ -4,7 +4,7 @@ use std::path::{Path, PathBuf};
 use crate::settings::MetadataVersion;
 use crate::{
     dist::{temp, ToolchainDesc},
-    toolchain::names::ToolchainName,
+    toolchain::ToolchainName,
     utils::notify::NotificationLevel,
 };
 

src/toolchain.rs

@@ -1,4 +1,13 @@
-pub(crate) mod distributable;
-pub(crate) mod names;
+mod distributable;
+pub(crate) use distributable::DistributableToolchain;
+
+mod names;
+pub(crate) use names::{
+    toolchain_sort, CustomToolchainName, LocalToolchainName, MaybeOfficialToolchainName,
+    MaybeResolvableToolchainName, PathBasedToolchainName, ResolvableLocalToolchainName,
+    ResolvableToolchainName, ToolchainName,
+};
+
 #[allow(clippy::module_inception)]
-pub(crate) mod toolchain;
+mod toolchain;
+pub(crate) use toolchain::Toolchain;