From 663ce420166a96493ee4abc2a5c06e2fab4498ee Mon Sep 17 00:00:00 2001
From: John Doty <john@d0ty.me>
Date: Tue, 13 Aug 2024 10:59:47 -0700
Subject: [PATCH] tempdir -> tempfile

According to the documentation of the tempdir crate
---
 Cargo.lock          | 79 +++++++++++----------------------------------
 Cargo.toml          |  2 +-
 src/reverse/unix.rs |  6 ++--
 3 files changed, 22 insertions(+), 65 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 111ae68..4e43104 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -340,6 +340,12 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "fastrand"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+
 [[package]]
 name = "flate2"
 version = "1.0.31"
@@ -350,12 +356,6 @@ dependencies = [
  "miniz_oxide",
 ]
 
-[[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-
 [[package]]
 name = "futures-core"
 version = "0.3.30"
@@ -379,9 +379,9 @@ dependencies = [
  "open",
  "pretty_assertions",
  "procfs",
- "rand 0.8.5",
+ "rand",
  "ratatui",
- "tempdir",
+ "tempfile",
  "thiserror",
  "tokio",
  "tokio-stream",
@@ -830,19 +830,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"
@@ -851,7 +838,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
  "rand_chacha",
- "rand_core 0.6.4",
+ "rand_core",
 ]
 
 [[package]]
@@ -861,24 +848,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"
@@ -909,15 +881,6 @@ dependencies = [
  "unicode-width",
 ]
 
-[[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.5.3"
@@ -927,15 +890,6 @@ dependencies = [
  "bitflags 2.6.0",
 ]
 
-[[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"
@@ -1144,13 +1098,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "tempdir"
-version = "0.3.7"
+name = "tempfile"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
+checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
 dependencies = [
- "rand 0.4.6",
- "remove_dir_all",
+ "cfg-if",
+ "fastrand",
+ "once_cell",
+ "rustix 0.38.34",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 0426ae9..2111a12 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,7 +34,7 @@ xdg = "2"
 [dev-dependencies]
 assert_matches = "1"
 pretty_assertions = "1"
-tempdir = "0.3"
+tempfile = "3"
 
 [target.'cfg(target_os="linux")'.dependencies]
 procfs = "0.14.1"
diff --git a/src/reverse/unix.rs b/src/reverse/unix.rs
index b85ed54..1d046b2 100644
--- a/src/reverse/unix.rs
+++ b/src/reverse/unix.rs
@@ -117,7 +117,7 @@ async fn handle_connection(
 mod tests {
     use super::*;
     use crate::message::MessageWriter;
-    use tempdir::TempDir;
+    use tempfile::TempDir;
 
     #[test]
     fn socket_path_repeats() {
@@ -131,8 +131,8 @@ mod tests {
     async fn url_to_message() {
         let (sender, mut receiver) = mpsc::channel(64);
 
-        let tmp_dir =
-            TempDir::new("url_to_message").expect("Error getting tmpdir");
+        let tmp_dir = TempDir::with_prefix("url_to_message")
+            .expect("Error getting tmpdir");
         let path = tmp_dir.path().join("socket");
 
         let path_override = path.clone();