Replace tempdir crate with tempfile

This commit is contained in:
Julian Braha
2024-01-24 17:58:09 +00:00
parent f8604e88ef
commit fd6f71d287
15 changed files with 78 additions and 119 deletions
+1 -1
View File
@@ -29,4 +29,4 @@ serde.workspace = true
serde_derive.workspace = true
serde_json.workspace = true
smol.workspace = true
tempdir.workspace = true
tempfile.workspace = true
+3 -1
View File
@@ -291,7 +291,9 @@ impl AutoUpdater {
cx.notify();
})?;
let temp_dir = tempdir::TempDir::new("zed-auto-update")?;
let temp_dir = tempfile::Builder::new()
.prefix("zed-auto-update")
.tempdir()?;
let dmg_path = temp_dir.path().join("Zed.dmg");
let mount_path = temp_dir.path().join("Zed");
let running_app_path = ZED_APP_PATH
+1 -1
View File
@@ -32,4 +32,4 @@ smol.workspace = true
[dev-dependencies]
gpui = { path = "../gpui", features = ["test-support"] }
env_logger.workspace = true
tempdir.workspace = true
tempfile.workspace = true
+12 -4
View File
@@ -196,7 +196,6 @@ mod tests {
use sqlez::domain::Domain;
use sqlez_macros::sql;
use tempdir::TempDir;
use crate::open_db;
@@ -220,7 +219,10 @@ mod tests {
}
}
let tempdir = TempDir::new("DbTests").unwrap();
let tempdir = tempfile::Builder::new()
.prefix("DbTests")
.tempdir()
.unwrap();
let _bad_db = open_db::<BadDB>(tempdir.path(), &util::channel::ReleaseChannel::Dev).await;
}
@@ -253,7 +255,10 @@ mod tests {
}
}
let tempdir = TempDir::new("DbTests").unwrap();
let tempdir = tempfile::Builder::new()
.prefix("DbTests")
.tempdir()
.unwrap();
{
let corrupt_db =
open_db::<CorruptedDB>(tempdir.path(), &util::channel::ReleaseChannel::Dev).await;
@@ -297,7 +302,10 @@ mod tests {
}
}
let tempdir = TempDir::new("DbTests").unwrap();
let tempdir = tempfile::Builder::new()
.prefix("DbTests")
.tempdir()
.unwrap();
{
// Setup the bad database
let corrupt_db =
+1 -1
View File
@@ -16,7 +16,7 @@ fsevent-sys = "3.0.2"
parking_lot.workspace = true
[dev-dependencies]
tempdir.workspace = true
tempfile.workspace = true
[package.metadata.docs.rs]
targets = ["x86_64-apple-darwin"]
+16 -5
View File
@@ -370,12 +370,14 @@ extern "C" {
mod tests {
use super::*;
use std::{fs, sync::mpsc, thread, time::Duration};
use tempdir::TempDir;
#[test]
fn test_event_stream_simple() {
for _ in 0..3 {
let dir = TempDir::new("test-event-stream").unwrap();
let dir = tempfile::Builder::new()
.prefix("test-event-stream")
.tempdir()
.unwrap();
let path = dir.path().canonicalize().unwrap();
for i in 0..10 {
fs::write(path.join(format!("existing-file-{}", i)), "").unwrap();
@@ -404,7 +406,10 @@ mod tests {
#[test]
fn test_event_stream_delayed_start() {
for _ in 0..3 {
let dir = TempDir::new("test-event-stream").unwrap();
let dir = tempfile::Builder::new()
.prefix("test-event-stream")
.tempdir()
.unwrap();
let path = dir.path().canonicalize().unwrap();
for i in 0..10 {
fs::write(path.join(format!("existing-file-{}", i)), "").unwrap();
@@ -438,7 +443,10 @@ mod tests {
#[test]
fn test_event_stream_shutdown_by_dropping_handle() {
let dir = TempDir::new("test-event-stream").unwrap();
let dir = tempfile::Builder::new()
.prefix("test-event-stream")
.tempdir()
.unwrap();
let path = dir.path().canonicalize().unwrap();
flush_historical_events();
@@ -465,7 +473,10 @@ mod tests {
#[test]
fn test_event_stream_shutdown_before_run() {
let dir = TempDir::new("test-event-stream").unwrap();
let dir = tempfile::Builder::new()
.prefix("test-event-stream")
.tempdir()
.unwrap();
let path = dir.path().canonicalize().unwrap();
let (stream, handle) = EventStream::new(&[&path], Duration::from_millis(50));
+1 -1
View File
@@ -83,5 +83,5 @@ prettier = { path = "../prettier", features = ["test-support"] }
util = { path = "../util", features = ["test-support"] }
rpc = { path = "../rpc", features = ["test-support"] }
git2.workspace = true
tempdir.workspace = true
tempfile.workspace = true
unindent.workspace = true
+1 -1
View File
@@ -43,6 +43,6 @@ prost-build = "0.9"
collections = { path = "../collections", features = ["test-support"] }
gpui = { path = "../gpui", features = ["test-support"] }
smol.workspace = true
tempdir.workspace = true
tempfile.workspace = true
ctor.workspace = true
env_logger.workspace = true
+1 -1
View File
@@ -56,7 +56,7 @@ node_runtime = { path = "../node_runtime"}
pretty_assertions.workspace = true
rand.workspace = true
unindent.workspace = true
tempdir.workspace = true
tempfile.workspace = true
ctor.workspace = true
env_logger.workspace = true
@@ -63,7 +63,9 @@ async fn test_semantic_index(cx: &mut TestAppContext) {
languages.add(rust_language);
languages.add(toml_language);
let db_dir = tempdir::TempDir::new("vector-store").unwrap();
let db_dir = tempfile::Builder::new()
.prefix("vector-store")
.tempdir();
let db_path = db_dir.path().join("db.sqlite");
let embedding_provider = Arc::new(FakeEmbeddingProvider::default());
+3 -3
View File
@@ -11,7 +11,7 @@ path = "src/util.rs"
doctest = true
[features]
test-support = ["tempdir", "git2"]
test-support = ["tempfile", "git2"]
[dependencies]
anyhow.workspace = true
@@ -25,7 +25,7 @@ smol.workspace = true
url = "2.2"
rand.workspace = true
rust-embed.workspace = true
tempdir = { workspace = true, optional = true }
tempfile = { workspace = true, optional = true }
serde.workspace = true
serde_json.workspace = true
git2 = { workspace = true, optional = true }
@@ -33,5 +33,5 @@ dirs = "3.0"
take-until = "0.2.0"
[dev-dependencies]
tempdir.workspace = true
tempfile.workspace = true
git2.workspace = true
+2 -2
View File
@@ -6,13 +6,13 @@ use std::{
ffi::OsStr,
path::{Path, PathBuf},
};
use tempdir::TempDir;
use tempfile::TempDir;
pub use assertions::*;
pub use marked_text::*;
pub fn temp_tree(tree: serde_json::Value) -> TempDir {
let dir = TempDir::new("").unwrap();
let dir = TempDir::new().unwrap();
write_tree(dir.path(), tree);
dir
}
+1 -1
View File
@@ -109,7 +109,7 @@ schemars.workspace = true
simplelog = "0.9"
smallvec.workspace = true
smol.workspace = true
tempdir.workspace = true
tempfile.workspace = true
thiserror.workspace = true
tiny_http = "0.8"
toml.workspace = true