Skip to content

Commit 694bc99

Browse files
committed
refactor(test/clitools): use globally-defined tempdir_in_with_prefix()
1 parent 4976b73 commit 694bc99

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

src/test/clitools.rs

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ use crate::cli::rustup_mode;
2525
use crate::process;
2626
use crate::test as rustup_test;
2727
use crate::test::const_dist_dir;
28+
use crate::test::tempdir_in_with_prefix;
2829
use crate::test::this_host_triple;
2930
use crate::utils;
3031

@@ -707,19 +708,11 @@ async fn setup_test_state(test_dist_dir: tempfile::TempDir) -> (tempfile::TempDi
707708
}
708709
let test_dir = rustup_test::test_dir().unwrap();
709710

710-
fn tempdir_in_with_prefix<P: AsRef<Path>>(path: P, prefix: &str) -> PathBuf {
711-
tempfile::Builder::new()
712-
.prefix(prefix)
713-
.tempdir_in(path.as_ref())
714-
.unwrap()
715-
.into_path()
716-
}
717-
718-
let exedir = tempdir_in_with_prefix(&test_dir, "rustup-exe");
719-
let customdir = tempdir_in_with_prefix(&test_dir, "rustup-custom");
720-
let cargodir = tempdir_in_with_prefix(&test_dir, "rustup-cargo");
721-
let homedir = tempdir_in_with_prefix(&test_dir, "rustup-home");
722-
let workdir = tempdir_in_with_prefix(&test_dir, "rustup-workdir");
711+
let exedir = tempdir_in_with_prefix(&test_dir, "rustup-exe").unwrap();
712+
let customdir = tempdir_in_with_prefix(&test_dir, "rustup-custom").unwrap();
713+
let cargodir = tempdir_in_with_prefix(&test_dir, "rustup-cargo").unwrap();
714+
let homedir = tempdir_in_with_prefix(&test_dir, "rustup-home").unwrap();
715+
let workdir = tempdir_in_with_prefix(&test_dir, "rustup-workdir").unwrap();
723716

724717
// The uninstall process on windows involves using the directory above
725718
// CARGO_HOME, so make sure it's a subdir of our tempdir

0 commit comments

Comments
 (0)