refactor(dist): privatize imports from dist::dist

Author: rami3l

src/cli/common.rs

@@ -16,8 +16,7 @@ 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::dist::{TargetTriple, ToolchainDesc};
-use crate::dist::manifest::ComponentStatus;
+use crate::dist::{manifest::ComponentStatus, TargetTriple, ToolchainDesc};
 use crate::install::UpdateStatus;
 use crate::toolchain::names::{LocalToolchainName, ToolchainName};
 use crate::toolchain::toolchain::Toolchain;

src/cli/rustup_mode.rs

@@ -25,8 +25,8 @@ use crate::{
         Process,
     },
     dist::{
-        dist::{PartialToolchainDesc, Profile, TargetTriple},
         manifest::{Component, ComponentStatus},
+        PartialToolchainDesc, Profile, TargetTriple,
     },
     errors::RustupError,
     install::{InstallMethod, UpdateStatus},

src/cli/self_update.rs

@@ -63,17 +63,16 @@ use same_file::Handle;
 use serde::{Deserialize, Serialize};
 use tracing::{error, info, trace, warn};
 
-use crate::currentprocess::terminalsource;
-use crate::errors::RustupError;
 use crate::{
     cli::{
         common::{self, ignorable_error, report_error, Confirm, PackageUpdate},
         errors::*,
         markdown::md,
     },
     config::Cfg,
-    currentprocess::Process,
-    dist::dist::{self, PartialToolchainDesc, Profile, TargetTriple, ToolchainDesc},
+    currentprocess::{terminalsource, Process},
+    dist::{self, PartialToolchainDesc, Profile, TargetTriple, ToolchainDesc},
+    errors::RustupError,
     install::UpdateStatus,
     toolchain::{
         distributable::DistributableToolchain,
@@ -1338,7 +1337,7 @@ mod tests {
 
     use crate::cli::common;
     use crate::cli::self_update::InstallOpts;
-    use crate::dist::dist::{PartialToolchainDesc, Profile};
+    use crate::dist::{PartialToolchainDesc, Profile};
     use crate::test::{test_dir, with_rustup_home, Env};
     use crate::{currentprocess::TestProcess, for_host};
 

src/cli/self_update/windows.rs

@@ -15,7 +15,7 @@ use super::common;
 use super::{install_bins, InstallOpts};
 use crate::cli::download_tracker::DownloadTracker;
 use crate::currentprocess::Process;
-use crate::dist::dist::TargetTriple;
+use crate::dist::TargetTriple;
 use crate::utils::utils;
 use crate::utils::Notification;
 

src/cli/setup_mode.rs

@@ -10,7 +10,7 @@ use crate::{
         self_update::{self, InstallOpts},
     },
     currentprocess::Process,
-    dist::dist::Profile,
+    dist::Profile,
     toolchain::names::MaybeOfficialToolchainName,
     utils::utils,
 };

src/config.rs

@@ -11,20 +11,15 @@ use thiserror::Error as ThisError;
 use tokio_stream::StreamExt;
 use tracing::trace;
 
-use crate::settings::MetadataVersion;
 use crate::{
     cli::self_update::SelfUpdateMode,
     currentprocess::Process,
-    dist::{
-        dist::{self, Profile, ToolchainDesc},
-        download::DownloadCfg,
-        temp,
-    },
+    dist::{self, download::DownloadCfg, temp, Profile, ToolchainDesc},
     errors::RustupError,
     fallback_settings::FallbackSettings,
     install::UpdateStatus,
     notifications::*,
-    settings::{Settings, SettingsFile},
+    settings::{MetadataVersion, Settings, SettingsFile},
     toolchain::{
         distributable::DistributableToolchain,
         names::{

src/dist/component/tests.rs

@@ -4,10 +4,10 @@ use std::path::PathBuf;
 
 use crate::currentprocess::TestProcess;
 use crate::dist::component::Transaction;
-use crate::dist::dist::DEFAULT_DIST_SERVER;
 use crate::dist::prefix::InstallPrefix;
 use crate::dist::temp;
 use crate::dist::Notification;
+use crate::dist::DEFAULT_DIST_SERVER;
 use crate::errors::RustupError;
 use crate::utils::raw as utils_raw;
 use crate::utils::utils;

src/dist/manifest.rs

@@ -21,10 +21,11 @@ use std::str::FromStr;
 use anyhow::{anyhow, bail, Context, Result};
 use serde::{Deserialize, Serialize};
 
-use super::{config::Config, dist::ToolchainDesc};
-use crate::dist::dist::{Profile, TargetTriple};
-use crate::errors::*;
-use crate::toolchain::distributable::DistributableToolchain;
+use crate::{
+    dist::{config::Config, Profile, TargetTriple, ToolchainDesc},
+    errors::*,
+    toolchain::distributable::DistributableToolchain,
+};
 
 /// Used by the `installed_components` function
 pub(crate) struct ComponentStatus {
@@ -627,8 +628,8 @@ impl fmt::Display for ManifestVersion {
 
 #[cfg(test)]
 mod tests {
-    use crate::dist::dist::TargetTriple;
     use crate::dist::manifest::Manifest;
+    use crate::dist::TargetTriple;
     use crate::RustupError;
 
     // Example manifest from https://public.etherpad-mozilla.org/p/Rust-infra-work-week

src/dist/manifestation.rs

@@ -14,12 +14,12 @@ use crate::dist::component::{
     Components, Package, TarGzPackage, TarXzPackage, TarZStdPackage, Transaction,
 };
 use crate::dist::config::Config;
-use crate::dist::dist::{Profile, TargetTriple, DEFAULT_DIST_SERVER};
 use crate::dist::download::{DownloadCfg, File};
 use crate::dist::manifest::{Component, CompressionKind, Manifest, TargetedPackage};
 use crate::dist::notifications::*;
 use crate::dist::prefix::InstallPrefix;
 use crate::dist::temp;
+use crate::dist::{Profile, TargetTriple, DEFAULT_DIST_SERVER};
 use crate::errors::RustupError;
 use crate::utils::utils;
 

src/dist/manifestation/tests.rs

@@ -17,12 +17,11 @@ use url::Url;
 use crate::{
     currentprocess::{Process, TestProcess},
     dist::{
-        dist::{Profile, TargetTriple, ToolchainDesc, DEFAULT_DIST_SERVER},
         download::DownloadCfg,
         manifest::{Component, Manifest},
         manifestation::{Changes, Manifestation, UpdateStatus},
         prefix::InstallPrefix,
-        temp, Notification,
+        temp, Notification, Profile, TargetTriple, ToolchainDesc, DEFAULT_DIST_SERVER,
     },
     errors::RustupError,
     test::mock::{dist::*, MockComponentBuilder, MockFile, MockInstallerBuilder},