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";

src/dist/component/tests.rs

@@ -9,8 +9,8 @@ use crate::dist::Notification;
 use crate::dist::DEFAULT_DIST_SERVER;
 use crate::errors::RustupError;
 use crate::process::TestProcess;
+use crate::utils;
 use crate::utils::raw as utils_raw;
-use crate::utils::utils;
 
 #[test]
 fn add_file() {

src/dist/component/transaction.rs

@@ -19,7 +19,7 @@ use crate::dist::prefix::InstallPrefix;
 use crate::dist::temp;
 use crate::errors::*;
 use crate::process::Process;
-use crate::utils::utils;
+use crate::utils;
 
 /// A Transaction tracks changes to the file system, allowing them to
 /// be rolled back in case of an error. Instead of deleting or

src/dist/download.rs

@@ -10,7 +10,7 @@ use crate::dist::notifications::*;
 use crate::dist::temp;
 use crate::errors::*;
 use crate::process::Process;
-use crate::utils::utils;
+use crate::utils;
 
 const UPDATE_HASH_LEN: usize = 20;
 

src/dist/manifestation.rs

@@ -21,7 +21,7 @@ use crate::dist::temp;
 use crate::dist::{Profile, TargetTriple, DEFAULT_DIST_SERVER};
 use crate::errors::RustupError;
 use crate::process::Process;
-use crate::utils::utils;
+use crate::utils;
 
 pub(crate) const DIST_MANIFEST: &str = "multirust-channel-manifest.toml";
 pub(crate) const CONFIG_FILE: &str = "multirust-config.toml";

src/dist/manifestation/tests.rs

@@ -25,7 +25,7 @@ use crate::{
     errors::RustupError,
     process::TestProcess,
     test::mock::{dist::*, MockComponentBuilder, MockFile, MockInstallerBuilder},
-    utils::{raw as utils_raw, utils},
+    utils::{self, raw as utils_raw},
 };
 
 const SHA256_HASH_LEN: usize = 64;

src/dist/mod.rs

@@ -18,7 +18,7 @@ use crate::{
     errors::RustupError,
     process::Process,
     toolchain::ToolchainName,
-    utils::utils,
+    utils,
 };
 
 pub mod component;

src/dist/prefix.rs

@@ -1,6 +1,6 @@
 use std::path::{Path, PathBuf};
 
-use crate::utils::utils;
+use crate::utils;
 
 const REL_MANIFEST_DIR: &str = "lib/rustlib";
 static V1_COMMON_COMPONENT_LIST: &[&str] = &["cargo", "rustc", "rust-docs"];

src/dist/temp.rs

@@ -7,9 +7,9 @@ use std::path::{Path, PathBuf};
 pub(crate) use anyhow::{Context as _, Result};
 use thiserror::Error as ThisError;
 
+use crate::utils;
 use crate::utils::notify::NotificationLevel;
 use crate::utils::raw;
-use crate::utils::utils;
 
 #[derive(Debug, ThisError)]
 pub(crate) enum CreatingError {

src/fallback_settings.rs

@@ -6,7 +6,7 @@ use anyhow::{Context, Result};
 use serde::Deserialize;
 
 #[cfg(unix)]
-use crate::utils::utils;
+use crate::utils;
 
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Default)]
 pub struct FallbackSettings {

src/install.rs

@@ -10,7 +10,7 @@ use crate::{
     errors::RustupError,
     notifications::Notification as RootNotification,
     toolchain::{CustomToolchainName, LocalToolchainName, Toolchain},
-    utils::utils,
+    utils,
 };
 
 #[derive(Clone, Debug)]

src/settings.rs

@@ -11,7 +11,7 @@ use crate::cli::self_update::SelfUpdateMode;
 use crate::dist::Profile;
 use crate::errors::*;
 use crate::notifications::*;
-use crate::utils::utils;
+use crate::utils;
 
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct SettingsFile {

src/test/mock/clitools.rs

@@ -25,7 +25,7 @@ use crate::process;
 use crate::test as rustup_test;
 use crate::test::const_dist_dir;
 use crate::test::this_host_triple;
-use crate::utils::utils;
+use crate::utils;
 
 use super::{
     dist::{

src/toolchain.rs

@@ -20,7 +20,7 @@ use crate::{
     dist::PartialToolchainDesc,
     env_var, install,
     notifications::Notification,
-    utils::{raw::open_dir_following_links, utils},
+    utils::{self, raw::open_dir_following_links},
     RustupError,
 };