Merge pull request #37 from alexanderkjall/replace-tempdir-with-tempfile

Replace tempdir with tempfile

Author: alexcrichton

Cargo.toml

@@ -17,7 +17,7 @@ libc = "0.2.50"
 [dev-dependencies]
 futures = "0.1"
 num_cpus = "1.0"
-tempdir = "0.3"
+tempfile = "3"
 tokio-core = "0.1"
 tokio-process = "0.2"
 

tests/client.rs

@@ -10,7 +10,6 @@ use std::thread;
 use futures::future::{self, Future};
 use futures::stream::{self, Stream};
 use jobserver::Client;
-use tempdir::TempDir;
 use tokio_core::reactor::Core;
 use tokio_process::CommandExt;
 
@@ -128,7 +127,7 @@ fn main() {
             None => true,
         })
         .map(|test| {
-            let td = t!(TempDir::new("foo"));
+            let td = t!(tempfile::tempdir());
             let makefile = format!(
                 "\
 all: export TEST_TO_RUN={}

tests/make-as-a-client.rs

@@ -5,7 +5,6 @@ use std::net::{TcpListener, TcpStream};
 use std::process::Command;
 
 use jobserver::Client;
-use tempdir::TempDir;
 
 macro_rules! t {
     ($e:expr) => {
@@ -37,7 +36,7 @@ fn main() {
     }
 
     let c = t!(Client::new(1));
-    let td = TempDir::new("foo").unwrap();
+    let td = tempfile::tempdir().unwrap();
 
     let prog = env::var("MAKE").unwrap_or_else(|_| "make".to_string());
 

tests/server.rs

@@ -8,7 +8,6 @@ use std::sync::Arc;
 use std::thread;
 
 use jobserver::Client;
-use tempdir::TempDir;
 
 macro_rules! t {
     ($e:expr) => {
@@ -56,7 +55,7 @@ fn server_blocks() {
 #[test]
 fn make_as_a_single_thread_client() {
     let c = t!(Client::new(1));
-    let td = TempDir::new("foo").unwrap();
+    let td = tempfile::tempdir().unwrap();
 
     let prog = env::var("MAKE").unwrap_or_else(|_| "make".to_string());
     let mut cmd = Command::new(prog);
@@ -110,7 +109,7 @@ foo
 #[test]
 fn make_as_a_multi_thread_client() {
     let c = t!(Client::new(1));
-    let td = TempDir::new("foo").unwrap();
+    let td = tempfile::tempdir().unwrap();
 
     let prog = env::var("MAKE").unwrap_or_else(|_| "make".to_string());
     let mut cmd = Command::new(prog);