summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndres Suarez <asuarez@meta.com>2023-10-21 07:17:56 -0700
committerFacebook GitHub Bot <facebook-github-bot@users.noreply.github.com>2023-10-21 07:17:56 -0700
commitac415e1d4a319b27798dcd974b19369d920de719 (patch)
treed094140215057e04a235cd7c6d3d44cd5bf3a7f3
parent616767b04b57d6ca82d2077f30fd84fa6586d2d1 (diff)
Replace tempdir with tempfile
Summary: `tempdir` has been deprecated since 2018: https://github.com/rust-lang-deprecated/tempdir/pull/46 It's functionality was merged into `tempfile` with minor tweaks: - Methods names: `new` -> `with_prefix`, `new_in` -> `with_prefix_in`. - `with_prefix_in`'s args order is reversed. - Temp dirs no longer have a period between the prefix and the random name (before `foo.123abc`, now `foo123abc`). Reviewed By: capickett Differential Revision: D50514209 fbshipit-source-id: a50e9f1c0c78a2642bae8edbb6098b3f04c89969
-rw-r--r--below/Cargo.toml2
-rw-r--r--below/common/Cargo.toml2
-rw-r--r--below/common/src/fileutil.rs6
-rw-r--r--below/config/Cargo.toml2
-rw-r--r--below/config/src/test.rs12
-rw-r--r--below/dump/Cargo.toml2
-rw-r--r--below/dump/src/lib.rs4
-rw-r--r--below/dump/src/test.rs4
-rw-r--r--below/src/main.rs8
-rw-r--r--below/src/test.rs6
-rw-r--r--below/store/Cargo.toml2
-rw-r--r--below/store/src/cursor.rs22
-rw-r--r--below/store/src/lib.rs38
-rw-r--r--below/view/Cargo.toml2
-rw-r--r--below/view/src/controllers/test.rs4
15 files changed, 59 insertions, 57 deletions
diff --git a/below/Cargo.toml b/below/Cargo.toml
index a4d97f12..3eedece3 100644
--- a/below/Cargo.toml
+++ b/below/Cargo.toml
@@ -43,7 +43,7 @@ slog = { version = "2.7", features = ["max_level_trace", "nested-values"] }
slog-term = "2.8"
store = { package = "below-store", version = "0.7.1", path = "store" }
tar = "0.4.40"
-tempdir = "0.3"
+tempfile = "3.5"
users = "0.11"
view = { package = "below-view", version = "0.7.1", path = "view" }
diff --git a/below/common/Cargo.toml b/below/common/Cargo.toml
index 6bad3684..e3673301 100644
--- a/below/common/Cargo.toml
+++ b/below/common/Cargo.toml
@@ -21,4 +21,4 @@ slog-term = "2.8"
walkdir = "2.3"
[dev-dependencies]
-tempdir = "0.3"
+tempfile = "3.5"
diff --git a/below/common/src/fileutil.rs b/below/common/src/fileutil.rs
index fbdd9849..c1c4f7bc 100644
--- a/below/common/src/fileutil.rs
+++ b/below/common/src/fileutil.rs
@@ -33,7 +33,7 @@ mod tests {
use std::io::BufWriter;
use std::io::Write;
- use tempdir::TempDir;
+ use tempfile::TempDir;
use super::*;
@@ -50,13 +50,13 @@ mod tests {
fn test_get_dir_size() {
// Empty directory
{
- let dir = TempDir::new("below_fileutil_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_fileutil_test.").expect("tempdir failed");
let size = get_dir_size(dir.path());
assert_eq!(size, 0);
}
// Directory with files and files in nested directories
{
- let dir = TempDir::new("below_fileutil_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_fileutil_test.").expect("tempdir failed");
fs::create_dir(dir.path().join("dir_A")).expect("Failed to create directory");
fs::create_dir(dir.path().join("dir_B")).expect("Failed to create directory");
make_file(dir.path().join("A"), 1000);
diff --git a/below/config/Cargo.toml b/below/config/Cargo.toml
index ca472ae3..61c4f618 100644
--- a/below/config/Cargo.toml
+++ b/below/config/Cargo.toml
@@ -17,4 +17,4 @@ serde = { version = "1.0.185", features = ["derive", "rc"] }
toml = "0.7.3"
[dev-dependencies]
-tempdir = "0.3"
+tempfile = "3.5"
diff --git a/below/config/src/test.rs b/below/config/src/test.rs
index dfe63b19..19eccfa6 100644
--- a/below/config/src/test.rs
+++ b/below/config/src/test.rs
@@ -14,7 +14,7 @@
use std::io::Write;
-use tempdir::TempDir;
+use tempfile::TempDir;
use super::*;
@@ -37,7 +37,8 @@ fn test_config_default() {
#[test]
fn test_config_fs_failure() {
- let tempdir = TempDir::new("below_config_fs_failuer").expect("Failed to create temp dir");
+ let tempdir =
+ TempDir::with_prefix("below_config_fs_failuer.").expect("Failed to create temp dir");
let path = tempdir.path();
match BelowConfig::load(&path.to_path_buf()) {
Ok(_) => panic!("Below should not load if the non existing path is not default path"),
@@ -59,7 +60,7 @@ fn test_config_fs_failure() {
#[test]
fn test_config_load_success() {
- let tempdir = TempDir::new("below_config_load").expect("Failed to create temp dir");
+ let tempdir = TempDir::with_prefix("below_config_load.").expect("Failed to create temp dir");
let path = tempdir.path().join("below.config");
let mut file = std::fs::OpenOptions::new()
@@ -93,7 +94,8 @@ fn test_config_load_success() {
#[test]
fn test_config_load_failed() {
- let tempdir = TempDir::new("below_config_load_failed").expect("Failed to create temp dir");
+ let tempdir =
+ TempDir::with_prefix("below_config_load_failed.").expect("Failed to create temp dir");
let path = tempdir.path().join("below.config");
let mut file = std::fs::OpenOptions::new()
.read(true)
@@ -122,7 +124,7 @@ fn test_config_load_failed() {
#[test]
fn test_config_partial_load() {
- let tempdir = TempDir::new("below_config_load").expect("Failed to create temp dir");
+ let tempdir = TempDir::with_prefix("below_config_load.").expect("Failed to create temp dir");
let path = tempdir.path().join("below.config");
let mut file = std::fs::OpenOptions::new()
diff --git a/below/dump/Cargo.toml b/below/dump/Cargo.toml
index d1a90b00..2d25dfb5 100644
--- a/below/dump/Cargo.toml
+++ b/below/dump/Cargo.toml
@@ -23,5 +23,5 @@ serde_json = { version = "1.0.100", features = ["float_roundtrip", "unbounded_de
slog = { version = "2.7", features = ["max_level_trace", "nested-values"] }
store = { package = "below-store", version = "0.7.1", path = "../store" }
tar = "0.4.40"
-tempdir = "0.3"
+tempfile = "3.5"
toml = "0.7.3"
diff --git a/below/dump/src/lib.rs b/below/dump/src/lib.rs
index 3b84dd49..541cc1b8 100644
--- a/below/dump/src/lib.rs
+++ b/below/dump/src/lib.rs
@@ -39,7 +39,7 @@ use store::advance::new_advance_remote;
use store::Advance;
use store::Direction;
use tar::Archive;
-use tempdir::TempDir;
+use tempfile::TempDir;
use toml::value::Value as TValue;
pub mod btrfs;
@@ -137,7 +137,7 @@ fn get_advance(
(None, Some(snapshot)) => {
let mut tarball =
Archive::new(fs::File::open(&snapshot).context("Failed to open snapshot file")?);
- let mut snapshot_dir = TempDir::new("snapshot_replay")?.into_path();
+ let mut snapshot_dir = TempDir::with_prefix("snapshot_replay.")?.into_path();
tarball.unpack(&snapshot_dir)?;
// Find and append the name of the original snapshot directory
for path in fs::read_dir(&snapshot_dir)? {
diff --git a/below/dump/src/test.rs b/below/dump/src/test.rs
index 029ac5c7..5fcdd8d7 100644
--- a/below/dump/src/test.rs
+++ b/below/dump/src/test.rs
@@ -20,7 +20,7 @@ use model::Collector;
use model::Queriable;
use render::HasRenderConfigForDump;
use serde_json::Value;
-use tempdir::TempDir;
+use tempfile::TempDir;
use tmain::Dumper;
use super::*;
@@ -1005,7 +1005,7 @@ fn test_dump_disk_titles() {
#[test]
fn test_parse_pattern() {
- let tempdir = TempDir::new("below_dump_pattern").expect("Failed to create temp dir");
+ let tempdir = TempDir::with_prefix("below_dump_pattern.").expect("Failed to create temp dir");
let path = tempdir.path().join("belowrc");
let mut file = std::fs::OpenOptions::new()
diff --git a/below/src/main.rs b/below/src/main.rs
index 0a0aa57f..c1c32e9c 100644
--- a/below/src/main.rs
+++ b/below/src/main.rs
@@ -50,7 +50,7 @@ use slog::error;
use slog::warn;
use tar::Archive;
use tar::Builder as TarBuilder;
-use tempdir::TempDir;
+use tempfile::TempDir;
use users::get_current_uid;
use users::get_user_by_uid;
@@ -886,7 +886,7 @@ fn replay(
(None, Some(snapshot)) => {
let mut tarball =
Archive::new(fs::File::open(&snapshot).context("Failed to open snapshot file")?);
- let mut snapshot_dir = TempDir::new("snapshot_replay")?.into_path();
+ let mut snapshot_dir = TempDir::with_prefix("snapshot_replay.")?.into_path();
tarball.unpack(&snapshot_dir)?;
// Find and append the name of the original snapshot directory
for path in fs::read_dir(&snapshot_dir)? {
@@ -1435,8 +1435,8 @@ fn snapshot(
// Create a directory for the output files
// Format: snapshot_<timestamp_begin>_<timestamp_end>
- let temp_folder = TempDir::new(&format!(
- "snapshot_{:011}_{:011}",
+ let temp_folder = TempDir::with_prefix(&format!(
+ "snapshot_{:011}_{:011}.",
timestamp_begin, timestamp_end
))
.context("Failed to create temporary folder for snapshot")?;
diff --git a/below/src/test.rs b/below/src/test.rs
index fed3ded9..6cde045f 100644
--- a/below/src/test.rs
+++ b/below/src/test.rs
@@ -28,12 +28,12 @@ use store::advance::new_advance_local;
use store::ChunkSizePo2;
use store::CompressionMode;
use store::DataFrame;
-use tempdir::TempDir;
+use tempfile::TempDir;
#[test]
fn record_replay_integration() {
let logger = get_logger();
- let dir = TempDir::new("below_record_replay_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_record_replay_test.").expect("tempdir failed");
let mut store = store::StoreWriter::new(
logger.clone(),
&dir,
@@ -123,7 +123,7 @@ fn record_replay_integration() {
#[test]
fn advance_forward_and_reverse() {
let logger = get_logger();
- let dir = TempDir::new("below_record_replay_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_record_replay_test.").expect("tempdir failed");
let mut store = store::StoreWriter::new(
logger.clone(),
&dir,
diff --git a/below/store/Cargo.toml b/below/store/Cargo.toml
index a9bf4c9b..6bde3431 100644
--- a/below/store/Cargo.toml
+++ b/below/store/Cargo.toml
@@ -30,7 +30,7 @@ itertools = "0.11.0"
lazy_static = "1.4"
paste = "1.0.13"
slog-term = "2.8"
-tempdir = "0.3"
+tempfile = "3.5"
zstd = { version = "0.13", features = ["experimental", "zstdmt"] }
[features]
diff --git a/below/store/src/cursor.rs b/below/store/src/cursor.rs
index d4645b1b..c81929c4 100644
--- a/below/store/src/cursor.rs
+++ b/below/store/src/cursor.rs
@@ -656,7 +656,7 @@ mod tests {
use common::util::get_unix_timestamp;
use slog::Drain;
- use tempdir::TempDir;
+ use tempfile::TempDir;
use Direction::Forward;
use Direction::Reverse;
@@ -798,7 +798,7 @@ mod tests {
/// Write a single sample in different ways and read it back.
fn simple_put_read(compression_mode: CompressionMode, format: Format) {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
let ts = get_unix_timestamp(SystemTime::now());
let now = std::time::UNIX_EPOCH + std::time::Duration::from_secs(ts);
let mut writer = StoreWriter::new(get_logger(), &dir, compression_mode, format)
@@ -911,7 +911,7 @@ mod tests {
/// Calling advance with nothing in the store and cursor uninitialized.
#[test]
fn advance_when_empty() {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
let mut cursor = StoreCursor::new(get_logger(), dir.path().to_path_buf());
assert!(!cursor.advance(Forward).unwrap());
@@ -923,7 +923,7 @@ mod tests {
/// Calling advance in both directions when cursor is at the last pos.
#[test]
fn advance_at_boundries() {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
let ts = get_unix_timestamp(SystemTime::now());
let writer = TestWriter::new(&dir);
let mut cursor = StoreCursor::new(get_logger(), dir.path().to_path_buf());
@@ -944,7 +944,7 @@ mod tests {
/// Cursor moves back and forth.
#[test]
fn advance_simple() {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
let ts = get_unix_timestamp(SystemTime::now());
let writer = TestWriter::new(&dir);
let mut cursor = StoreCursor::new(get_logger(), dir.path().to_path_buf());
@@ -973,7 +973,7 @@ mod tests {
/// Retry advance succeeds after updates.
#[test]
fn advance_retry() {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
let ts = get_unix_timestamp(SystemTime::now());
let writer = TestWriter::new(&dir);
let mut cursor = StoreCursor::new(get_logger(), dir.path().to_path_buf());
@@ -999,7 +999,7 @@ mod tests {
/// Get corrupt index/data should return None.
#[test]
fn get_corrupt() {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
let ts = get_unix_timestamp(SystemTime::now());
let writer = TestWriter::new(&dir);
let mut cursor = StoreCursor::new(get_logger(), dir.path().to_path_buf());
@@ -1020,7 +1020,7 @@ mod tests {
/// Calling next skips corrupted index/data entries.
#[test]
fn skip_corrupt() {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
let ts = get_unix_timestamp(SystemTime::now());
let writer = TestWriter::new(&dir);
let mut cursor = StoreCursor::new(get_logger(), dir.path().to_path_buf());
@@ -1055,7 +1055,7 @@ mod tests {
/// Ensure get and set cursor offset work as expected.
#[test]
fn manipulate_offset() {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
let ts = get_unix_timestamp(SystemTime::now());
let writer = TestWriter::new(&dir);
let mut cursor = StoreCursor::new(get_logger(), dir.path().to_path_buf());
@@ -1102,7 +1102,7 @@ mod tests {
/// Calling advance after set_offset with invalid offsets.
#[test]
fn advance_from_invalid_offset() {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
let ts = get_unix_timestamp(SystemTime::now());
let writer = TestWriter::new(&dir);
let mut cursor = StoreCursor::new(get_logger(), dir.path().to_path_buf());
@@ -1130,7 +1130,7 @@ mod tests {
/// Ensure jump_to_key works as expected.
#[test]
fn jump_to_key() {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
let ts = get_unix_timestamp(SystemTime::now());
let writer = TestWriter::new(&dir);
let mut cursor = StoreCursor::new(get_logger(), dir.path().to_path_buf());
diff --git a/below/store/src/lib.rs b/below/store/src/lib.rs
index 6e9f0ebe..5b3b58e5 100644
--- a/below/store/src/lib.rs
+++ b/below/store/src/lib.rs
@@ -880,7 +880,7 @@ mod tests {
use paste::paste;
use slog::Drain;
- use tempdir::TempDir;
+ use tempfile::TempDir;
use super::*;
@@ -931,7 +931,7 @@ mod tests {
fn writing_to_already_written_index_with_different_compression_format_works() {
use itertools::Itertools;
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
let ts = std::time::UNIX_EPOCH + Duration::from_secs(SHARD_TIME);
// States, (compression_mode, format), that we transition between when
@@ -991,7 +991,7 @@ mod tests {
#[test]
fn write_index_padding() {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
// Keep test on one shard
let ts = std::time::UNIX_EPOCH + Duration::from_secs(SHARD_TIME);
// Write 1 frame without compression. Doesn't add padding.
@@ -1110,14 +1110,14 @@ mod tests {
store_test!(create_writer, _create_writer);
fn _create_writer(compression_mode: CompressionMode, format: Format) {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
StoreWriter::new(get_logger(), &dir, compression_mode, format)
.expect("Failed to create store");
}
store_test!(simple_put_read, _simple_put_read);
fn _simple_put_read(compression_mode: CompressionMode, format: Format) {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
let ts = SystemTime::now();
{
let mut writer = StoreWriter::new(get_logger(), &dir, compression_mode, format)
@@ -1139,7 +1139,7 @@ mod tests {
store_test!(simple_put_read_10, _simple_put_read_10);
fn _simple_put_read_10(compression_mode: CompressionMode, format: Format) {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
// Keep test on one shard
let ts = std::time::UNIX_EPOCH + Duration::from_secs(SHARD_TIME);
{
@@ -1170,7 +1170,7 @@ mod tests {
store_test!(put_new_shard, _put_new_shard);
fn _put_new_shard(compression_mode: CompressionMode, format: Format) {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
let now = SystemTime::now();
// Ensure that the follow writes (within 60s) are to the same shard
let ts = if calculate_shard(now) == calculate_shard(now + Duration::from_secs(60)) {
@@ -1269,7 +1269,7 @@ mod tests {
store_test!(put_read_corrupt_data, _put_read_corrupt_data);
fn _put_read_corrupt_data(compression_mode: CompressionMode, format: Format) {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
let ts = SystemTime::now();
let ts_next = ts + Duration::from_secs(1);
{
@@ -1322,7 +1322,7 @@ mod tests {
_read_past_the_end_returns_none
);
fn _read_past_the_end_returns_none(compression_mode: CompressionMode, format: Format) {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
let ts = SystemTime::now();
{
let mut writer = StoreWriter::new(get_logger(), &dir, compression_mode, format)
@@ -1345,7 +1345,7 @@ mod tests {
store_test!(read_iterates_appropriately, _read_iterates_appropriately);
fn _read_iterates_appropriately(compression_mode: CompressionMode, format: Format) {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
let ts = SystemTime::now();
{
let mut writer = StoreWriter::new(get_logger(), &dir, compression_mode, format)
@@ -1378,7 +1378,7 @@ mod tests {
_put_and_read_work_across_shards
);
fn _put_and_read_work_across_shards(compression_mode: CompressionMode, format: Format) {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
let ts = SystemTime::now();
{
let mut writer = StoreWriter::new(get_logger(), &dir, compression_mode, format)
@@ -1408,7 +1408,7 @@ mod tests {
store_test!(read_reverse, _read_reverse);
fn _read_reverse(compression_mode: CompressionMode, format: Format) {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
let ts = SystemTime::now();
{
let mut writer = StoreWriter::new(get_logger(), &dir, compression_mode, format)
@@ -1430,7 +1430,7 @@ mod tests {
store_test!(read_reverse_across_shards, _read_reverse_across_shards);
fn _read_reverse_across_shards(compression_mode: CompressionMode, format: Format) {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
let ts = SystemTime::now();
{
let mut writer = StoreWriter::new(get_logger(), &dir, compression_mode, format)
@@ -1460,7 +1460,7 @@ mod tests {
store_test!(discard_earlier, _discard_earlier);
fn _discard_earlier(compression_mode: CompressionMode, format: Format) {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
let ts = std::time::UNIX_EPOCH + Duration::from_secs(SHARD_TIME);
{
let mut writer = StoreWriter::new(get_logger(), &dir, compression_mode, format)
@@ -1501,7 +1501,7 @@ mod tests {
store_test!(try_discard_until_size, _try_discard_until_size);
fn _try_discard_until_size(compression_mode: CompressionMode, format: Format) {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
let dir_path_buf = dir.path().to_path_buf();
let ts = std::time::UNIX_EPOCH + Duration::from_secs(SHARD_TIME);
let mut shard_sizes = Vec::new();
@@ -1624,7 +1624,7 @@ mod tests {
store_test!(flock_protects, _flock_protects);
fn _flock_protects(compression_mode: CompressionMode, format: Format) {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
let ts = SystemTime::now();
let shard = calculate_shard(ts);
let mut index_path = dir.path().to_path_buf();
@@ -1651,7 +1651,7 @@ mod tests {
_writing_to_already_written_index_works
);
fn _writing_to_already_written_index_works(compression_mode: CompressionMode, format: Format) {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
let ts = std::time::UNIX_EPOCH + Duration::from_secs(SHARD_TIME);
{
let mut writer = StoreWriter::new(get_logger(), &dir, compression_mode, format)
@@ -1695,7 +1695,7 @@ mod tests {
_read_skips_over_corrupt_index_entry
);
fn _read_skips_over_corrupt_index_entry(compression_mode: CompressionMode, format: Format) {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
let ts = std::time::UNIX_EPOCH + Duration::from_secs(SHARD_TIME);
{
let mut writer = StoreWriter::new(get_logger(), &dir, compression_mode, format)
@@ -1743,7 +1743,7 @@ mod tests {
store_test!(writer_creates_directory, _writer_creates_directory);
fn _writer_creates_directory(compression_mode: CompressionMode, format: Format) {
- let dir = TempDir::new("below_store_test").expect("tempdir failed");
+ let dir = TempDir::with_prefix("below_store_test.").expect("tempdir failed");
let mut subdir = dir.path().to_path_buf();
subdir.push("foo");
let ts = SystemTime::now();
diff --git a/below/view/Cargo.toml b/below/view/Cargo.toml
index d6b2fd06..3c98c02a 100644
--- a/below/view/Cargo.toml
+++ b/below/view/Cargo.toml
@@ -29,4 +29,4 @@ store = { package = "below-store", version = "0.7.1", path = "../store" }
toml = "0.7.3"
[dev-dependencies]
-tempdir = "0.3"
+tempfile = "3.5"
diff --git a/below/view/src/controllers/test.rs b/below/view/src/controllers/test.rs
index 322ad148..6f108158 100644
--- a/below/view/src/controllers/test.rs
+++ b/below/view/src/controllers/test.rs
@@ -14,7 +14,7 @@
use std::io::prelude::*;
-use tempdir::TempDir;
+use tempfile::TempDir;
use super::*;
use crate::fake_view::FakeView;
@@ -295,7 +295,7 @@ fn test_event_to_str() {
#[test]
fn test_belowrc_to_event() {
// Creating self cleaning test belowrc file
- let tempdir = TempDir::new("below_cmd_test").expect("Failed to create temp dir");
+ let tempdir = TempDir::with_prefix("below_cmd_test.").expect("Failed to create temp dir");
let path = tempdir.path().join("belowrc");
let mut file = std::fs::OpenOptions::new()