Skip to content

Commit 631307c

Browse files
Nemo157Joshua Nelson
authored and
Joshua Nelson
committed
Remove local usage of deprecated tempdir
1 parent b4c90d7 commit 631307c

File tree

6 files changed

+23
-9
lines changed

6 files changed

+23
-9
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ systemstat = "0.1.4"
3838
prometheus = { version = "0.7.0", default-features = false }
3939
lazy_static = "1.0.0"
4040
rustwide = "0.6.0"
41-
tempdir = "0.3"
4241
mime_guess = "2"
4342
dotenv = "0.15"
4443

@@ -48,6 +47,7 @@ router = "0.5"
4847
handlebars-iron = "0.22"
4948
params = "0.8"
5049
staticfile = { version = "0.4", features = [ "cache" ] }
50+
tempfile = "3.1.0"
5151

5252
[target.'cfg(not(windows))'.dependencies]
5353
libc = "0.2"

src/docbuilder/rustwide_builder.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,9 @@ impl RustwideBuilder {
215215

216216
info!("copying essential files for {}", self.rustc_version);
217217
let source = build.host_target_dir().join("doc");
218-
let dest = ::tempdir::TempDir::new("essential-files")?;
218+
let dest = tempfile::Builder::new()
219+
.prefix("essential-files")
220+
.tempdir()?;
219221

220222
let files = ESSENTIAL_FILES_VERSIONED
221223
.iter()
@@ -321,7 +323,7 @@ impl RustwideBuilder {
321323
};
322324
krate.fetch(&self.workspace)?;
323325

324-
let local_storage = ::tempdir::TempDir::new("docsrs-docs")?;
326+
let local_storage = tempfile::Builder::new().prefix("docsrs-docs").tempdir()?;
325327

326328
let res = build_dir
327329
.build(&self.toolchain, &krate, self.prepare_sandbox(&limits))

src/storage/mod.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,10 @@ mod test {
199199
}
200200

201201
pub(crate) fn test_roundtrip(blobs: &[Blob]) {
202-
let dir = tempdir::TempDir::new("docs.rs-upload-test").unwrap();
202+
let dir = tempfile::Builder::new()
203+
.prefix("docs.rs-upload-test")
204+
.tempdir()
205+
.unwrap();
203206
for blob in blobs {
204207
let path = dir.path().join(&blob.path);
205208
if let Some(parent) = path.parent() {
@@ -228,7 +231,10 @@ mod test {
228231
#[test]
229232
fn test_uploads() {
230233
use std::fs;
231-
let dir = tempdir::TempDir::new("docs.rs-upload-test").unwrap();
234+
let dir = tempfile::Builder::new()
235+
.prefix("docs.rs-upload-test")
236+
.tempdir()
237+
.unwrap();
232238
let files = ["Cargo.toml", "src/main.rs"];
233239
for &file in &files {
234240
let path = dir.path().join(file);

src/test/fakes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ impl<'a> FakeRelease<'a> {
151151
use std::fs;
152152
use std::path::Path;
153153

154-
let tempdir = tempdir::TempDir::new("docs.rs-fake")?;
154+
let tempdir = tempfile::Builder::new().prefix("docs.rs-fake").tempdir()?;
155155
let package = self.package;
156156
let db = self.db;
157157

src/utils/copy.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,14 @@ mod test {
4747

4848
#[test]
4949
fn test_copy_doc_dir() {
50-
let source = tempdir::TempDir::new("cratesfyi-src").unwrap();
51-
let destination = tempdir::TempDir::new("cratesfyi-dst").unwrap();
50+
let source = tempfile::Builder::new()
51+
.prefix("cratesfyi-src")
52+
.tempdir()
53+
.unwrap();
54+
let destination = tempfile::Builder::new()
55+
.prefix("cratesfyi-dst")
56+
.tempdir()
57+
.unwrap();
5258
let doc = source.path().join("doc");
5359
fs::create_dir(&doc).unwrap();
5460
fs::create_dir(doc.join("inner")).unwrap();

0 commit comments

Comments
 (0)