Skip to content

Commit af0fa64

Browse files
committed
style: regroup some imports
1 parent db02369 commit af0fa64

File tree

6 files changed

+6
-14
lines changed

6 files changed

+6
-14
lines changed

src/cli/self_update/unix.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ use tracing::{error, warn};
77
use super::install_bins;
88
use super::shell;
99
use crate::process::Process;
10-
use crate::utils;
11-
use crate::utils::Notification;
10+
use crate::utils::{self, Notification};
1211

1312
// If the user is trying to install with sudo, on some systems this will
1413
// result in writing root-owned files to the user's home directory, because

src/cli/self_update/windows.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ use super::{install_bins, report_error, InstallOpts};
2323
use crate::cli::{download_tracker::DownloadTracker, markdown::md};
2424
use crate::dist::TargetTriple;
2525
use crate::process::{terminalsource::ColorableTerminal, Process};
26-
use crate::utils;
27-
use crate::utils::Notification;
26+
use crate::utils::{self, Notification};
2827

2928
pub(crate) fn ensure_prompt(process: &Process) -> Result<()> {
3029
writeln!(process.stdout().lock(),)?;

src/dist/component/package.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ use crate::dist::component::transaction::*;
1818
use crate::dist::temp;
1919
use crate::errors::*;
2020
use crate::process::Process;
21-
use crate::utils;
22-
use crate::utils::notifications::Notification;
21+
use crate::utils::{self, Notification};
2322

2423
/// The current metadata revision used by rust-installer
2524
pub(crate) const INSTALLER_VERSION: &str = "3";

src/dist/component/tests.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ use crate::dist::Notification;
99
use crate::dist::DEFAULT_DIST_SERVER;
1010
use crate::errors::RustupError;
1111
use crate::process::TestProcess;
12-
use crate::utils;
13-
use crate::utils::raw as utils_raw;
12+
use crate::utils::{self, raw as utils_raw};
1413

1514
#[test]
1615
fn add_file() {

src/dist/temp.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ use std::path::{Path, PathBuf};
77
pub(crate) use anyhow::{Context as _, Result};
88
use thiserror::Error as ThisError;
99

10-
use crate::utils;
11-
use crate::utils::notify::NotificationLevel;
12-
use crate::utils::raw;
10+
use crate::utils::{self, notify::NotificationLevel, raw};
1311

1412
#[derive(Debug, ThisError)]
1513
pub(crate) enum CreatingError {

src/utils/mod.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,8 @@ use crate::process::Process;
2222

2323
#[cfg(not(windows))]
2424
pub(crate) use crate::utils::raw::find_cmd;
25-
pub(crate) use crate::utils::raw::is_directory;
26-
27-
pub(crate) use crate::utils::notifications::Notification;
2825
pub use crate::utils::raw::{is_file, path_exists};
26+
pub(crate) use crate::utils::{notifications::Notification, raw::is_directory};
2927

3028
#[must_use]
3129
#[derive(Debug, PartialEq, Eq)]

0 commit comments

Comments
 (0)