Skip to content

Commit

Permalink
Remove wildcard import
Browse files Browse the repository at this point in the history
  • Loading branch information
djc committed Apr 9, 2024
1 parent ffdad99 commit 7e5da76
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
5 changes: 3 additions & 2 deletions src/cli/proxy_mode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use anyhow::Result;
use crate::{
cli::{common::set_globals, job, self_update},
command::run_command_for_dir,
process::Process,
toolchain::names::{LocalToolchainName, ResolvableLocalToolchainName},
utils::utils::{self, ExitCode},
Cfg,
Expand All @@ -17,7 +18,7 @@ pub fn main(arg0: &str) -> Result<ExitCode> {
let ExitCode(c) = {
let _setup = job::setup();

let process = crate::Process::get();
let process = Process::get();
let mut args = process.args_os().skip(1);

// Check for a + toolchain specifier
Expand All @@ -30,7 +31,7 @@ pub fn main(arg0: &str) -> Result<ExitCode> {
.transpose()?;

// Build command args now while we know whether or not to skip arg 1.
let cmd_args: Vec<_> = crate::Process::get()
let cmd_args: Vec<_> = Process::get()
.args_os()
.skip(1 + toolchain.is_some() as usize)
.collect();
Expand Down
8 changes: 5 additions & 3 deletions src/cli/rustup_mode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@ use crate::{
},
errors::RustupError,
install::UpdateStatus,
process::Process,
terminalsource::{self, ColorableTerminal},
process::{
terminalsource::{self, ColorableTerminal},
Process,
},
toolchain::{
distributable::DistributableToolchain,
names::{
Expand Down Expand Up @@ -1683,7 +1685,7 @@ fn set_profile(cfg: &mut Cfg, m: &ArgMatches) -> Result<utils::ExitCode> {

fn set_auto_self_update(cfg: &mut Cfg, m: &ArgMatches) -> Result<utils::ExitCode> {
if self_update::NEVER_SELF_UPDATE {
let process = crate::Process::get();
let process = Process::get();
let mut args = process.args_os();
let arg0 = args.next().map(PathBuf::from);
let arg0 = arg0
Expand Down
1 change: 0 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
pub(crate) use crate::config::*;
pub use crate::errors::*;
pub(crate) use crate::notifications::*;
use crate::process::*;
pub(crate) use crate::utils::toml_utils;
use anyhow::{anyhow, Result};
use itertools::{chain, Itertools};
Expand Down

0 comments on commit 7e5da76

Please sign in to comment.