mirror of
https://github.com/nukesor/pueue
synced 2024-10-01 13:34:07 +00:00
chore: Use tempfile instead of deprecated tempdir
This commit is contained in:
parent
9624c80664
commit
edcb366fd0
72
Cargo.lock
generated
72
Cargo.lock
generated
|
@ -550,12 +550,6 @@ dependencies = [
|
|||
"instant",
|
||||
]
|
||||
|
||||
[[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.26"
|
||||
|
@ -1128,7 +1122,7 @@ version = "0.1.1"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9"
|
||||
dependencies = [
|
||||
"rand 0.8.5",
|
||||
"rand",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
@ -1278,7 +1272,7 @@ dependencies = [
|
|||
"portpicker",
|
||||
"pretty_assertions",
|
||||
"procfs",
|
||||
"rand 0.8.5",
|
||||
"rand",
|
||||
"rcgen",
|
||||
"rev_buf_reader",
|
||||
"rustls",
|
||||
|
@ -1292,7 +1286,7 @@ dependencies = [
|
|||
"snap",
|
||||
"strum",
|
||||
"strum_macros",
|
||||
"tempdir",
|
||||
"tempfile",
|
||||
"thiserror",
|
||||
"tokio",
|
||||
"tokio-rustls",
|
||||
|
@ -1309,19 +1303,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"
|
||||
|
@ -1330,7 +1311,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
|
|||
dependencies = [
|
||||
"libc",
|
||||
"rand_chacha",
|
||||
"rand_core 0.6.4",
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
@ -1340,24 +1321,9 @@ 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"
|
||||
|
@ -1379,15 +1345,6 @@ dependencies = [
|
|||
"yasna",
|
||||
]
|
||||
|
||||
[[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",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.2.16"
|
||||
|
@ -1431,15 +1388,6 @@ version = "0.6.28"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
|
||||
|
||||
[[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 = "rev_buf_reader"
|
||||
version = "0.3.0"
|
||||
|
@ -1814,16 +1762,6 @@ dependencies = [
|
|||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tempdir"
|
||||
version = "0.3.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
|
||||
dependencies = [
|
||||
"rand 0.4.6",
|
||||
"remove_dir_all",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tempfile"
|
||||
version = "3.4.0"
|
||||
|
|
|
@ -128,7 +128,9 @@ pub fn daemon_base_setup() -> Result<(Settings, TempDir)> {
|
|||
|
||||
// Create a temporary directory used for testing.
|
||||
// The path is canonicalized to ensure test consistency across platforms.
|
||||
let tempdir = Builder::new().tempdir_in(canonicalize(temp_dir())?)?;
|
||||
let tempdir = Builder::new()
|
||||
.prefix("pueue-")
|
||||
.tempdir_in(canonicalize(temp_dir())?)?;
|
||||
let tempdir_path = tempdir.path();
|
||||
|
||||
std::fs::create_dir(tempdir_path.join("certs")).unwrap();
|
||||
|
|
|
@ -43,7 +43,7 @@ tokio = { workspace = true, features = ["macros", "net", "io-util"] }
|
|||
|
||||
[dev-dependencies]
|
||||
portpicker = "0.1"
|
||||
tempdir = "0.3"
|
||||
tempfile = "3"
|
||||
|
||||
anyhow = { workspace = true }
|
||||
better-panic = { workspace = true }
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
use tempdir::TempDir;
|
||||
use tempfile::{Builder, TempDir};
|
||||
|
||||
use portpicker::pick_unused_port;
|
||||
use pueue_lib::settings::*;
|
||||
|
@ -7,7 +7,7 @@ pub fn get_shared_settings(
|
|||
#[cfg_attr(target_os = "windows", allow(unused_variables))] use_unix_socket: bool,
|
||||
) -> (Shared, TempDir) {
|
||||
// Create a temporary directory used for testing.
|
||||
let tempdir = TempDir::new("pueue_lib").unwrap();
|
||||
let tempdir = Builder::new().prefix("pueue_lib-").tempdir().unwrap();
|
||||
let tempdir_path = tempdir.path();
|
||||
|
||||
std::fs::create_dir(tempdir_path.join("certs")).unwrap();
|
||||
|
|
Loading…
Reference in a new issue