From cfeb34296dbe615ecacee8ec4102c306f07f9f73 Mon Sep 17 00:00:00 2001 From: Filipe Rodrigues Date: Thu, 30 Jan 2025 02:14:23 +0000 Subject: [PATCH] Replaced `tempdir` with `tempfile`. --- Cargo.lock | 145 +++++++++++++++++++++++++------------------- Cargo.toml | 2 +- tests/keep_going.rs | 4 +- tests/util/mod.rs | 4 +- 4 files changed, 86 insertions(+), 69 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bd26169..6f963a2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -387,6 +387,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "errno" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + [[package]] name = "event-listener" version = "5.4.0" @@ -408,6 +418,12 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "fastrand" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + [[package]] name = "file-id" version = "0.2.2" @@ -454,12 +470,6 @@ dependencies = [ "libc", ] -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - [[package]] name = "futures" version = "0.3.31" @@ -557,7 +567,19 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.13.3+wasi-0.2.2", + "windows-targets", ] [[package]] @@ -840,6 +862,12 @@ dependencies = [ "redox_syscall", ] +[[package]] +name = "linux-raw-sys" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" + [[package]] name = "lock_api" version = "0.4.12" @@ -906,7 +934,7 @@ checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ "libc", "log", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", ] @@ -1124,19 +1152,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi", -] - [[package]] name = "rand" version = "0.8.5" @@ -1145,7 +1160,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha", - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -1155,40 +1170,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", + "rand_core", ] -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - [[package]] name = "rand_core" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", -] - -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", + "getrandom 0.2.15", ] [[package]] @@ -1244,21 +1235,25 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - [[package]] name = "rustc-demangle" version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +[[package]] +name = "rustix" +version = "0.38.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" +dependencies = [ + "bitflags 2.8.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.59.0", +] + [[package]] name = "rustversion" version = "1.0.19" @@ -1385,13 +1380,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" [[package]] -name = "tempdir" -version = "0.3.7" +name = "tempfile" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" +checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91" dependencies = [ - "rand 0.4.6", - "remove_dir_all", + "cfg-if", + "fastrand", + "getrandom 0.3.1", + "once_cell", + "rustix", + "windows-sys 0.59.0", ] [[package]] @@ -1499,7 +1498,7 @@ dependencies = [ "indexmap 1.9.3", "pin-project", "pin-project-lite", - "rand 0.8.5", + "rand", "slab", "tokio", "tokio-util", @@ -1665,6 +1664,15 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasi" +version = "0.13.3+wasi-0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +dependencies = [ + "wit-bindgen-rt", +] + [[package]] name = "winapi" version = "0.3.9" @@ -1778,6 +1786,15 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "wit-bindgen-rt" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" +dependencies = [ + "bitflags 2.8.0", +] + [[package]] name = "zbuild" version = "0.1.9" @@ -1794,7 +1811,7 @@ dependencies = [ "notify-debouncer-full", "pin-project", "smallvec", - "tempdir", + "tempfile", "tokio", "tokio-stream", "tracing", diff --git a/Cargo.toml b/Cargo.toml index 624cb4c..fe140a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ unicode-ident = "1.0.16" [dev-dependencies] -tempdir = "0.3.7" # TODO: Replace with `tempfile` +tempfile = "3.16.0" tracing-test = { version = "0.2.5", features = ["no-env-filter"] } [features] diff --git a/tests/keep_going.rs b/tests/keep_going.rs index c23a0a6..c9a8089 100644 --- a/tests/keep_going.rs +++ b/tests/keep_going.rs @@ -10,7 +10,7 @@ mod util; use { anyhow::Context, std::fs, - tempdir::TempDir, + tempfile::TempDir, zbuild::{Args, ExitResult}, }; @@ -47,7 +47,7 @@ async fn keep_going() -> ExitResult { /// When testing with `keep_going = false`, we ensure that `C1` is not built, /// since `C2` exits after `B` errors, so nothing else should be built. async fn inner(keep_going: bool) -> Result<(), anyhow::Error> { - let temp_dir = TempDir::new("zbuild").context("Unable to create temporary directory")?; + let temp_dir = TempDir::with_prefix("zbuild").context("Unable to create temporary directory")?; let zbuild_zb = temp_dir.path().join("zbuild.zb"); // TODO: Instead of sleeping, use `inotify` to wait for other diff --git a/tests/util/mod.rs b/tests/util/mod.rs index 3171d86..a0ff39a 100644 --- a/tests/util/mod.rs +++ b/tests/util/mod.rs @@ -7,14 +7,14 @@ )] // Imports -use {anyhow::Context, std::fs, tempdir::TempDir, zbuild::Args}; +use {anyhow::Context, std::fs, tempfile::TempDir, zbuild::Args}; /// Creates a directory with a zbuild manifest, then runs it, and returns the directory pub async fn with_zbuild<'a, T>(zbuild_manifest: &str, targets: T) -> Result where T: AsRef<[&'a str]>, { - let temp_dir = TempDir::new("zbuild").context("Unable to create temporary directory")?; + let temp_dir = TempDir::with_prefix("zbuild").context("Unable to create temporary directory")?; let zbuild_zb = temp_dir.path().join("zbuild.zb"); fs::write(&zbuild_zb, zbuild_manifest).context("Unable to write zbuild manifest")?;