refactor(utils): hoist utils::utils into utils

Author: rami3l

src/bin/rustup-init.rs

@@ -33,7 +33,7 @@ use rustup::env_var::RUST_RECURSION_COUNT_MAX;
 use rustup::errors::RustupError;
 use rustup::is_proxyable_tools;
 use rustup::process::Process;
-use rustup::utils::utils;
+use rustup::utils;
 
 #[tokio::main]
 async fn main() -> Result<ExitCode> {

src/cli/common.rs

@@ -27,7 +27,7 @@ use crate::{
     notifications::Notification,
     process::{terminalsource, Process},
     toolchain::{DistributableToolchain, LocalToolchainName, Toolchain, ToolchainName},
-    utils::{notifications as util_notifications, notify::NotificationLevel, utils},
+    utils::{self, notifications as util_notifications, notify::NotificationLevel},
 };
 
 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/rustup_mode.rs

@@ -37,7 +37,7 @@ use crate::{
         MaybeResolvableToolchainName, ResolvableLocalToolchainName, ResolvableToolchainName,
         Toolchain, ToolchainName,
     },
-    utils::utils::{self, ExitCode},
+    utils::{self, ExitCode},
 };
 
 const TOOLCHAIN_OVERRIDE_ERROR: &str =

src/cli/self_update.rs

@@ -63,7 +63,7 @@ use crate::{
         DistributableToolchain, MaybeOfficialToolchainName, ResolvableToolchainName, Toolchain,
         ToolchainName,
     },
-    utils::{utils, Notification},
+    utils::{self, Notification},
     DUP_TOOLS, TOOLS,
 };
 

src/cli/self_update/unix.rs

@@ -7,7 +7,7 @@ use tracing::{error, warn};
 use super::install_bins;
 use super::shell;
 use crate::process::Process;
-use crate::utils::utils;
+use crate::utils;
 use crate::utils::Notification;
 
 // If the user is trying to install with sudo, on some systems this will

src/cli/self_update/windows.rs

@@ -23,7 +23,7 @@ use super::{install_bins, report_error, InstallOpts};
 use crate::cli::{download_tracker::DownloadTracker, markdown::md};
 use crate::dist::TargetTriple;
 use crate::process::{terminalsource::ColorableTerminal, Process};
-use crate::utils::utils;
+use crate::utils;
 use crate::utils::Notification;
 
 pub(crate) fn ensure_prompt(process: &Process) -> Result<()> {

src/cli/setup_mode.rs

@@ -13,7 +13,7 @@ use crate::{
     dist::Profile,
     process::Process,
     toolchain::MaybeOfficialToolchainName,
-    utils::utils,
+    utils,
 };
 
 /// The installer for rustup

src/config.rs

@@ -26,7 +26,7 @@ use crate::{
         CustomToolchainName, DistributableToolchain, LocalToolchainName, PathBasedToolchainName,
         ResolvableLocalToolchainName, ResolvableToolchainName, Toolchain, ToolchainName,
     },
-    utils::utils,
+    utils,
 };
 
 #[derive(Debug, ThisError)]

src/dist/component/components.rs

@@ -12,7 +12,7 @@ use crate::dist::component::transaction::Transaction;
 use crate::dist::prefix::InstallPrefix;
 use crate::errors::RustupError;
 use crate::process::Process;
-use crate::utils::utils;
+use crate::utils;
 
 const COMPONENTS_FILE: &str = "components";
 

src/dist/component/package.rs

@@ -18,8 +18,8 @@ use crate::dist::component::transaction::*;
 use crate::dist::temp;
 use crate::errors::*;
 use crate::process::Process;
+use crate::utils;
 use crate::utils::notifications::Notification;
-use crate::utils::utils;
 
 /// The current metadata revision used by rust-installer
 pub(crate) const INSTALLER_VERSION: &str = "3";