Switch from tempdir to tempfile

kelpsyberry · Mar 29, 2024 · 9c52119 · 9c52119
1 parent 2f1b154
commit 9c52119
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 78 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/frontend/desktop/Cargo.toml b/frontend/desktop/Cargo.toml
@@ -14,7 +14,7 @@ debug-views = [
  "dust-core/channel-audio-capture",
 ]
 gdb-server = ["gdb-protocol", "dust-core/debugger-hooks"]
-dldi = ["fatfs", "tempdir"]
+dldi = ["fatfs", "tempfile"]
 
 discord-presence = ["discord-rpc"]
 
@@ -62,7 +62,7 @@ parking_lot = "0.12"
 bitflags = "2.5"
 miniz_oxide = { version = "0.7", features = ["simd"] }
 fatfs = { version = "0.3", optional = true }
-tempdir = { version = "0.3", optional = true }
+tempfile = { version = "3.10", optional = true }
 proc-bitfield = { version = "0.3", features = ["nightly"] }
 
 # Config
@@ -86,4 +86,4 @@ gdb-protocol = { version = "0.1", optional = true }
 [target.'cfg(target_os = "macos")'.dependencies]
 cocoa = "0.25"
 objc = "0.2"
-tempdir = "0.3"
+tempfile = "3.10"
diff --git a/frontend/desktop/src/emu/dldi.rs b/frontend/desktop/src/emu/dldi.rs
@@ -8,7 +8,7 @@ use std::{
  io::{self, Read, Seek, SeekFrom, Write},
  path::{Path, PathBuf},
 };
-use tempdir::TempDir;
+use tempfile::TempDir;
 
 struct LoadedChunk {
  index: u64,
@@ -257,7 +257,7 @@ impl FsProvider {
  return Ok(());
  }
  let mut chunk_manager = ChunkManager {
- temp_dir: TempDir::new("dust-dldi")?,
+ temp_dir: tempfile::Builder::new().prefix("dust-dldi").tempdir()?,
  cur_addr: 0,
  fs_max_size: 1 << 30,
  chunk_size_shift: 22,

diff --git a/frontend/desktop/src/ui/title_menu_bar.rs b/frontend/desktop/src/ui/title_menu_bar.rs
@@ -14,7 +14,7 @@ use imgui::{Image, TextureId};
 use std::path::PathBuf;
 use std::{fmt::Write, path::Path};
 #[cfg(target_os = "macos")]
-use tempdir::TempDir;
+use tempfile::TempDir;
 
 bitflags::bitflags! {
  #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -57,7 +57,7 @@ impl TitleMenuBarState {
  game_file_path: None,
  #[cfg(target_os = "macos")]
  temp_icon_dir: if config!(_config, game_icon_mode) == GameIconMode::Game {
- TempDir::new("dust-icons").ok()
+ tempfile::Builder::new().prefix("dust-icons").tempdir().ok()
  } else {
  None
  },
@@ -292,7 +292,9 @@ impl TitleMenuBarState {
  match config!(config, game_icon_mode) {
  GameIconMode::None => None,
  GameIconMode::File => None,
- GameIconMode::Game => TempDir::new("dust-icons").ok(),
+ GameIconMode::Game => {
+ tempfile::Builder::new().prefix("dust-icons").tempdir().ok()
+ }
  }
  };
  self.update_game_icon(config, _window);