@@ -58,7 +58,7 @@ use anyhow::{anyhow, Context, Result};
58
58
use cfg_if:: cfg_if;
59
59
use same_file:: Handle ;
60
60
61
- use crate :: currentprocess :: terminalsource;
61
+ use crate :: process :: terminalsource;
62
62
use crate :: {
63
63
cli:: {
64
64
common:: { self , ignorable_error, report_error, Confirm , PackageUpdate } ,
@@ -1306,18 +1306,18 @@ mod tests {
1306
1306
use crate :: cli:: common;
1307
1307
use crate :: dist:: dist:: PartialToolchainDesc ;
1308
1308
use crate :: test:: { test_dir, with_rustup_home, Env } ;
1309
- use crate :: { currentprocess , for_host } ;
1309
+ use crate :: { for_host , process } ;
1310
1310
1311
1311
#[ test]
1312
1312
fn default_toolchain_is_stable ( ) {
1313
1313
with_rustup_home ( |home| {
1314
1314
let mut vars = HashMap :: new ( ) ;
1315
1315
home. apply ( & mut vars) ;
1316
- let tp = currentprocess :: TestProcess {
1316
+ let tp = process :: TestProcess {
1317
1317
vars,
1318
1318
..Default :: default ( )
1319
1319
} ;
1320
- currentprocess :: with ( tp. clone ( ) . into ( ) , || -> Result < ( ) > {
1320
+ process :: with ( tp. clone ( ) . into ( ) , || -> Result < ( ) > {
1321
1321
// TODO: we could pass in a custom cfg to get notification
1322
1322
// callbacks rather than output to the tp sink.
1323
1323
let mut cfg = common:: set_globals ( false , false ) . unwrap ( ) ;
@@ -1360,11 +1360,11 @@ info: default host triple is {0}
1360
1360
let cargo_home = root_dir. path ( ) . join ( "cargo" ) ;
1361
1361
let mut vars = HashMap :: new ( ) ;
1362
1362
vars. env ( "CARGO_HOME" , cargo_home. to_string_lossy ( ) . to_string ( ) ) ;
1363
- let tp = currentprocess :: TestProcess {
1363
+ let tp = process :: TestProcess {
1364
1364
vars,
1365
1365
..Default :: default ( )
1366
1366
} ;
1367
- currentprocess :: with ( tp. into ( ) , || -> Result < ( ) > {
1367
+ process :: with ( tp. into ( ) , || -> Result < ( ) > {
1368
1368
super :: install_bins ( ) . unwrap ( ) ;
1369
1369
Ok ( ( ) )
1370
1370
} )
0 commit comments