From cebefa87832244682edeacae81c05b38c2414ca0 Mon Sep 17 00:00:00 2001 From: Matt Mastracci Date: Wed, 22 Mar 2023 12:55:19 -0600 Subject: chore(test_util): replace tempdir code w/tempdir crate (#18340) --- cli/Cargo.toml | 2 +- cli/bench/main.rs | 2 +- cli/tools/standalone.rs | 2 +- cli/tools/upgrade.rs | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'cli') diff --git a/cli/Cargo.toml b/cli/Cargo.toml index f9214c999..7fd904681 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -91,11 +91,11 @@ regex.workspace = true ring.workspace = true rustyline = { version = "=10.0.0", default-features = false, features = ["custom-bindings"] } rustyline-derive = "=0.7.0" -secure_tempfile = { version = "=3.4.0", package = "tempfile" } # different name to discourage use in tests serde.workspace = true serde_repr.workspace = true shell-escape = "=0.1.5" tar.workspace = true +tempfile.workspace = true text-size = "=1.1.0" text_lines = "=0.6.0" thiserror.workspace = true diff --git a/cli/bench/main.rs b/cli/bench/main.rs index ac1798b02..02c775e8f 100644 --- a/cli/bench/main.rs +++ b/cli/bench/main.rs @@ -502,7 +502,7 @@ async fn main() -> Result<()> { let mut syscall_count = HashMap::::new(); for (name, args, expected_exit_code) in EXEC_TIME_BENCHMARKS { - let mut file = secure_tempfile::NamedTempFile::new()?; + let mut file = tempfile::NamedTempFile::new()?; let exit_status = Command::new("strace") .args([ diff --git a/cli/tools/standalone.rs b/cli/tools/standalone.rs index 93c3aebf0..31f472b78 100644 --- a/cli/tools/standalone.rs +++ b/cli/tools/standalone.rs @@ -120,7 +120,7 @@ async fn get_base_binary( } let archive_data = tokio::fs::read(binary_path).await?; - let temp_dir = secure_tempfile::TempDir::new()?; + let temp_dir = tempfile::TempDir::new()?; let base_binary_path = crate::tools::upgrade::unpack_into_dir( archive_data, target.contains("windows"), diff --git a/cli/tools/upgrade.rs b/cli/tools/upgrade.rs index 039e00b00..7ce9e77b9 100644 --- a/cli/tools/upgrade.rs +++ b/cli/tools/upgrade.rs @@ -379,7 +379,7 @@ pub async fn upgrade( log::info!("Deno is upgrading to version {}", &install_version); - let temp_dir = secure_tempfile::TempDir::new()?; + let temp_dir = tempfile::TempDir::new()?; let new_exe_path = unpack_into_dir(archive_data, cfg!(windows), &temp_dir)?; fs::set_permissions(&new_exe_path, permissions)?; check_exe(&new_exe_path)?; @@ -476,7 +476,7 @@ async fn download_package( pub fn unpack_into_dir( archive_data: Vec, is_windows: bool, - temp_dir: &secure_tempfile::TempDir, + temp_dir: &tempfile::TempDir, ) -> Result { const EXE_NAME: &str = "deno"; let temp_dir_path = temp_dir.path(); -- cgit v1.2.3