1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
|
From: =?UTF-8?q?Alexander=20Kj=C3=A4ll?= <alexander.kjall@gmail.com>
Date: Tue, 8 Feb 2022 12:16:05 +0100
Subject: [PATCH] Replace tempdir with tempfile, as the tempdir crate have been
superceded by tempfile
Forwarded: https://github.com/danburkert/fs2-rs/pull/43
---
Cargo.toml | 2 +-
src/lib.rs | 32 ++++++++++++++++----------------
src/unix.rs | 10 +++++-----
src/windows.rs | 14 +++++++-------
4 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index 2fac260f..5af72121 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,2 +22,2 @@
-[dev-dependencies.tempdir]
-version = "0.3"
+[dev-dependencies.tempfile]
+version = "3"
diff --git a/src/lib.rs b/src/lib.rs
index 51b22db6..b9cb97bc 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -199,7 +199,7 @@ pub fn allocation_granularity<P>(path: P) -> Result<u64> where P: AsRef<Path> {
#[cfg(test)]
mod test {
- extern crate tempdir;
+ extern crate tempfile;
extern crate test;
use std::fs;
@@ -209,7 +209,7 @@ mod test {
/// Tests file duplication.
#[test]
fn duplicate() {
- let tempdir = tempdir::TempDir::new("fs2").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let path = tempdir.path().join("fs2");
let mut file1 =
fs::OpenOptions::new().read(true).write(true).create(true).open(&path).unwrap();
@@ -234,7 +234,7 @@ mod test {
/// Tests shared file lock operations.
#[test]
fn lock_shared() {
- let tempdir = tempdir::TempDir::new("fs2").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let path = tempdir.path().join("fs2");
let file1 = fs::OpenOptions::new().read(true).write(true).create(true).open(&path).unwrap();
let file2 = fs::OpenOptions::new().read(true).write(true).create(true).open(&path).unwrap();
@@ -257,7 +257,7 @@ mod test {
/// Tests exclusive file lock operations.
#[test]
fn lock_exclusive() {
- let tempdir = tempdir::TempDir::new("fs2").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let path = tempdir.path().join("fs2");
let file1 = fs::OpenOptions::new().read(true).write(true).create(true).open(&path).unwrap();
let file2 = fs::OpenOptions::new().read(true).write(true).create(true).open(&path).unwrap();
@@ -277,7 +277,7 @@ mod test {
/// Tests that a lock is released after the file that owns it is dropped.
#[test]
fn lock_cleanup() {
- let tempdir = tempdir::TempDir::new("fs2").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let path = tempdir.path().join("fs2");
let file1 = fs::OpenOptions::new().read(true).write(true).create(true).open(&path).unwrap();
let file2 = fs::OpenOptions::new().read(true).write(true).create(true).open(&path).unwrap();
@@ -294,7 +294,7 @@ mod test {
/// Tests file allocation.
#[test]
fn allocate() {
- let tempdir = tempdir::TempDir::new("fs2").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let path = tempdir.path().join("fs2");
let file = fs::OpenOptions::new().write(true).create(true).open(&path).unwrap();
let blksize = allocation_granularity(&path).unwrap();
@@ -321,7 +321,7 @@ mod test {
/// Checks filesystem space methods.
#[test]
fn filesystem_space() {
- let tempdir = tempdir::TempDir::new("fs2").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let total_space = total_space(&tempdir.path()).unwrap();
let free_space = free_space(&tempdir.path()).unwrap();
let available_space = available_space(&tempdir.path()).unwrap();
@@ -335,7 +335,7 @@ mod test {
/// for comparing against the truncate and allocate benchmarks.
#[bench]
fn bench_file_create(b: &mut test::Bencher) {
- let tempdir = tempdir::TempDir::new("fs2").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let path = tempdir.path().join("file");
b.iter(|| {
@@ -353,7 +353,7 @@ mod test {
#[bench]
fn bench_file_truncate(b: &mut test::Bencher) {
let size = 32 * 1024 * 1024;
- let tempdir = tempdir::TempDir::new("fs2").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let path = tempdir.path().join("file");
b.iter(|| {
@@ -372,7 +372,7 @@ mod test {
#[bench]
fn bench_file_allocate(b: &mut test::Bencher) {
let size = 32 * 1024 * 1024;
- let tempdir = tempdir::TempDir::new("fs2").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let path = tempdir.path().join("file");
b.iter(|| {
@@ -391,7 +391,7 @@ mod test {
#[bench]
fn bench_allocated_size(b: &mut test::Bencher) {
let size = 32 * 1024 * 1024;
- let tempdir = tempdir::TempDir::new("fs2").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let path = tempdir.path().join("file");
let file = fs::OpenOptions::new()
.read(true)
@@ -409,7 +409,7 @@ mod test {
/// Benchmarks duplicating a file descriptor or handle.
#[bench]
fn bench_duplicate(b: &mut test::Bencher) {
- let tempdir = tempdir::TempDir::new("fs2").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let path = tempdir.path().join("fs2");
let file = fs::OpenOptions::new().read(true).write(true).create(true).open(&path).unwrap();
@@ -419,7 +419,7 @@ mod test {
/// Benchmarks locking and unlocking a file lock.
#[bench]
fn bench_lock_unlock(b: &mut test::Bencher) {
- let tempdir = tempdir::TempDir::new("fs2").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let path = tempdir.path().join("fs2");
let file = fs::OpenOptions::new().read(true).write(true).create(true).open(&path).unwrap();
@@ -432,7 +432,7 @@ mod test {
/// Benchmarks the free space method.
#[bench]
fn bench_free_space(b: &mut test::Bencher) {
- let tempdir = tempdir::TempDir::new("fs2").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
b.iter(|| {
test::black_box(free_space(&tempdir.path()).unwrap());
});
@@ -441,7 +441,7 @@ mod test {
/// Benchmarks the available space method.
#[bench]
fn bench_available_space(b: &mut test::Bencher) {
- let tempdir = tempdir::TempDir::new("fs2").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
b.iter(|| {
test::black_box(available_space(&tempdir.path()).unwrap());
});
@@ -450,7 +450,7 @@ mod test {
/// Benchmarks the total space method.
#[bench]
fn bench_total_space(b: &mut test::Bencher) {
- let tempdir = tempdir::TempDir::new("fs2").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
b.iter(|| {
test::black_box(total_space(&tempdir.path()).unwrap());
});
diff --git a/src/unix.rs b/src/unix.rs
index 5c2f4f22..bdc293b5 100644
--- a/src/unix.rs
+++ b/src/unix.rs
@@ -174,7 +174,7 @@ pub fn statvfs(path: &Path) -> Result<FsStats> {
#[cfg(test)]
mod test {
- extern crate tempdir;
+ extern crate tempfile;
extern crate libc;
use std::fs::{self, File};
@@ -185,7 +185,7 @@ mod test {
/// The duplicate method returns a file with a new file descriptor.
#[test]
fn duplicate_new_fd() {
- let tempdir = tempdir::TempDir::new("fs2").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let path = tempdir.path().join("fs2");
let file1 = fs::OpenOptions::new().write(true).create(true).open(&path).unwrap();
let file2 = file1.duplicate().unwrap();
@@ -200,7 +200,7 @@ mod test {
unsafe { libc::fcntl(file.as_raw_fd(), libc::F_GETFL, 0) }
}
- let tempdir = tempdir::TempDir::new("fs2").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let path = tempdir.path().join("fs2");
let file1 = fs::OpenOptions::new().write(true).create(true).open(&path).unwrap();
let file2 = file1.duplicate().unwrap();
@@ -212,7 +212,7 @@ mod test {
/// held on the file descriptor.
#[test]
fn lock_replace() {
- let tempdir = tempdir::TempDir::new("fs2").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let path = tempdir.path().join("fs2");
let file1 = fs::OpenOptions::new().write(true).create(true).open(&path).unwrap();
let file2 = fs::OpenOptions::new().write(true).create(true).open(&path).unwrap();
@@ -232,7 +232,7 @@ mod test {
/// Tests that locks are shared among duplicated file descriptors.
#[test]
fn lock_duplicate() {
- let tempdir = tempdir::TempDir::new("fs2").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let path = tempdir.path().join("fs2");
let file1 = fs::OpenOptions::new().write(true).create(true).open(&path).unwrap();
let file2 = file1.duplicate().unwrap();
diff --git a/src/windows.rs b/src/windows.rs
index 0e37c665..3bb056c1 100644
--- a/src/windows.rs
+++ b/src/windows.rs
@@ -157,7 +157,7 @@ pub fn statvfs(path: &Path) -> Result<FsStats> {
#[cfg(test)]
mod test {
- extern crate tempdir;
+ extern crate tempfile;
use std::fs;
use std::os::windows::io::AsRawHandle;
@@ -167,7 +167,7 @@ mod test {
/// The duplicate method returns a file with a new file handle.
#[test]
fn duplicate_new_handle() {
- let tempdir = tempdir::TempDir::new("fs2").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let path = tempdir.path().join("fs2");
let file1 = fs::OpenOptions::new().write(true).create(true).open(&path).unwrap();
let file2 = file1.duplicate().unwrap();
@@ -177,7 +177,7 @@ mod test {
/// A duplicated file handle does not have access to the original handle's locks.
#[test]
fn lock_duplicate_handle_independence() {
- let tempdir = tempdir::TempDir::new("fs2").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let path = tempdir.path().join("fs2");
let file1 = fs::OpenOptions::new().read(true).write(true).create(true).open(&path).unwrap();
let file2 = file1.duplicate().unwrap();
@@ -196,7 +196,7 @@ mod test {
/// shared locked.
#[test]
fn lock_non_reentrant() {
- let tempdir = tempdir::TempDir::new("fs2").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let path = tempdir.path().join("fs2");
let file = fs::OpenOptions::new().read(true).write(true).create(true).open(&path).unwrap();
@@ -216,7 +216,7 @@ mod test {
/// be unlocked independently.
#[test]
fn lock_layering() {
- let tempdir = tempdir::TempDir::new("fs2").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let path = tempdir.path().join("fs2");
let file = fs::OpenOptions::new().read(true).write(true).create(true).open(&path).unwrap();
@@ -245,7 +245,7 @@ mod test {
/// A file handle with multiple open locks will have all locks closed on drop.
#[test]
fn lock_layering_cleanup() {
- let tempdir = tempdir::TempDir::new("fs2").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let path = tempdir.path().join("fs2");
let file1 = fs::OpenOptions::new().read(true).write(true).create(true).open(&path).unwrap();
let file2 = fs::OpenOptions::new().read(true).write(true).create(true).open(&path).unwrap();
@@ -263,7 +263,7 @@ mod test {
/// duplicates have been closed. This on really smells like a bug in Windows.
#[test]
fn lock_duplicate_cleanup() {
- let tempdir = tempdir::TempDir::new("fs2").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let path = tempdir.path().join("fs2");
let file1 = fs::OpenOptions::new().read(true).write(true).create(true).open(&path).unwrap();
let file2 = file1.duplicate().unwrap();
|
