deps: update tempfile to 3

Signed-off-by: Igor Gnatenko <[email protected]>

Cargo.toml

@@ -26,8 +26,7 @@ cc = "1"
 bytes = { git = "https://github.com/carllerche/bytes", rev = "ae1b454" }
 lazy_static = "1"
 rand = "0.4"
-tempdir = "0.3"
-tempfile = "2"
+tempfile = "3"
 
 [target.'cfg(target_os = "freebsd")'.dev-dependencies]
 sysctl = "0.1"

src/unistd.rs

@@ -421,15 +421,15 @@ pub fn fchdir(dirfd: RawFd) -> Result<()> {
 /// # Example
 ///
 /// ```rust
-/// extern crate tempdir;
+/// extern crate tempfile;
 /// extern crate nix;
 ///
 /// use nix::unistd;
 /// use nix::sys::stat;
-/// use tempdir::TempDir;
+/// use tempfile::TempDir;
 ///
 /// fn main() {
-///     let tmp_dir1 = TempDir::new("test_mkdir").unwrap();
+///     let tmp_dir1 = TempDir::new().unwrap();
 ///     let tmp_dir2 = tmp_dir1.path().join("new_dir");
 ///
 ///     // create new directory and give read, write and execute rights to the owner
@@ -464,15 +464,15 @@ pub fn mkdir<P: ?Sized + NixPath>(path: &P, mode: Mode) -> Result<()> {
 /// # Example
 ///
 /// ```rust
-/// extern crate tempdir;
+/// extern crate tempfile;
 /// extern crate nix;
 ///
 /// use nix::unistd;
 /// use nix::sys::stat;
-/// use tempdir::TempDir;
+/// use tempfile::TempDir;
 ///
 /// fn main() {
-///     let tmp_dir = TempDir::new("test_fifo").unwrap();
+///     let tmp_dir = TempDir::new().unwrap();
 ///     let fifo_path = tmp_dir.path().join("foo.pipe");
 ///
 ///     // create new fifo and give read, write and execute rights to the owner

test/sys/test_socket.rs

@@ -90,9 +90,12 @@ pub fn test_abstract_uds_addr() {
 pub fn test_getsockname() {
     use nix::sys::socket::{socket, AddressFamily, SockType, SockFlag};
     use nix::sys::socket::{bind, SockAddr};
-    use tempdir::TempDir;
+    use tempfile;
 
-    let tempdir = TempDir::new("test_getsockname").unwrap();
+    let tempdir = tempfile::Builder::new()
+                      .prefix("test_getsockname")
+                      .tempdir()
+                      .unwrap();
     let sockname = tempdir.path().join("sock");
     let sock = socket(AddressFamily::Unix, SockType::Stream, SockFlag::empty(), None)
                .expect("socket failed");
@@ -209,9 +212,12 @@ pub fn test_unixdomain() {
     use nix::sys::socket::{bind, socket, connect, listen, accept, SockAddr};
     use nix::unistd::{read, write, close};
     use std::thread;
-    use tempdir::TempDir;
+    use tempfile;
 
-    let tempdir = TempDir::new("test_unixdomain").unwrap();
+    let tempdir = tempfile::Builder::new()
+                      .prefix("test_unixdomain")
+                      .tempdir()
+                      .unwrap();
     let sockname = tempdir.path().join("sock");
     let s1 = socket(AddressFamily::Unix, SockType::Stream,
                     SockFlag::empty(), None).expect("socket failed");

test/sys/test_uio.rs

@@ -5,8 +5,7 @@ use std::{cmp, iter};
 use std::fs::{OpenOptions};
 use std::os::unix::io::AsRawFd;
 
-use tempdir::TempDir;
-use tempfile::tempfile;
+use tempfile::{self, tempfile};
 
 #[test]
 fn test_writev() {
@@ -114,7 +113,10 @@ fn test_pwrite() {
 fn test_pread() {
     use std::io::Write;
 
-    let tempdir = TempDir::new("nix-test_pread").unwrap();
+    let tempdir = tempfile::Builder::new()
+                      .prefix("nix-test_pread")
+                      .tempdir()
+                      .unwrap();
 
     let path = tempdir.path().join("pread_test_file");
     let mut file = OpenOptions::new().write(true).read(true).create(true)
@@ -142,7 +144,10 @@ fn test_pwritev() {
         IoVec::from_slice(&to_write[64..128]),
     ];
 
-    let tempdir = TempDir::new("nix-test_pwritev").unwrap();
+    let tempdir = tempfile::Builder::new()
+                      .prefix("nix-test_pwritev")
+                      .tempdir()
+                      .unwrap();
 
     // pwritev them into a temporary file
     let path = tempdir.path().join("pwritev_test_file");
@@ -166,7 +171,10 @@ fn test_preadv() {
     let to_write: Vec<u8> = (0..200).collect();
     let expected: Vec<u8> = (100..200).collect();
 
-    let tempdir = TempDir::new("nix-test_preadv").unwrap();
+    let tempdir = tempfile::Builder::new()
+                      .prefix("nix-test_preadv")
+                      .tempdir()
+                      .unwrap();
 
     let path = tempdir.path().join("preadv_test_file");
 

test/test.rs

@@ -7,7 +7,6 @@ extern crate nix;
 extern crate lazy_static;
 extern crate libc;
 extern crate rand;
-extern crate tempdir;
 extern crate tempfile;
 
 mod sys;

test/test_fcntl.rs

@@ -1,8 +1,7 @@
 use nix::fcntl::{openat, open, OFlag, readlink, readlinkat};
 use nix::sys::stat::Mode;
 use nix::unistd::{close, read};
-use tempdir::TempDir;
-use tempfile::NamedTempFile;
+use tempfile::{self, NamedTempFile};
 use std::io::prelude::*;
 use std::os::unix::fs;
 
@@ -30,7 +29,9 @@ fn test_openat() {
 
 #[test]
 fn test_readlink() {
-    let tempdir = TempDir::new("nix-test_readdir")
+    let tempdir = tempfile::Builder::new()
+        .prefix("nix-test_readdir")
+        .tempdir()
         .unwrap_or_else(|e| panic!("tempdir failed: {}", e));
     let src = tempdir.path().join("a");
     let dst = tempdir.path().join("b");

test/test_mount.rs

@@ -5,7 +5,7 @@
 
 extern crate libc;
 extern crate nix;
-extern crate tempdir;
+extern crate tempfile;
 
 #[cfg(target_os = "linux")]
 mod test_mount {
@@ -23,7 +23,7 @@ mod test_mount {
     use nix::sys::stat::{self, Mode};
     use nix::unistd::getuid;
 
-    use tempdir::TempDir;
+    use tempfile;
 
     static SCRIPT_CONTENTS: &'static [u8] = b"#!/bin/sh
 exit 23";
@@ -32,7 +32,9 @@ exit 23";
 
     const NONE: Option<&'static [u8]> = None;
     pub fn test_mount_tmpfs_without_flags_allows_rwx() {
-        let tempdir = TempDir::new("nix-test_mount")
+        let tempdir = tempfile::Builder::new()
+                          .prefix("nix-test_mount")
+                          .tempdir()
                           .unwrap_or_else(|e| panic!("tempdir failed: {}", e));
 
         mount(NONE,
@@ -89,7 +91,9 @@ exit 23";
     }
 
     pub fn test_mount_rdonly_disallows_write() {
-        let tempdir = TempDir::new("nix-test_mount")
+        let tempdir = tempfile::Builder::new()
+                          .prefix("nix-test_mount")
+                          .tempdir()
                           .unwrap_or_else(|e| panic!("tempdir failed: {}", e));
 
         mount(NONE,
@@ -107,7 +111,9 @@ exit 23";
     }
 
     pub fn test_mount_noexec_disallows_exec() {
-        let tempdir = TempDir::new("nix-test_mount")
+        let tempdir = tempfile::Builder::new()
+                          .prefix("nix-test_mount")
+                          .tempdir()
                           .unwrap_or_else(|e| panic!("tempdir failed: {}", e));
 
         mount(NONE,
@@ -146,12 +152,16 @@ exit 23";
     }
 
     pub fn test_mount_bind() {
-        let tempdir = TempDir::new("nix-test_mount")
+        let tempdir = tempfile::Builder::new()
+                          .prefix("nix-test_mount")
+                          .tempdir()
                           .unwrap_or_else(|e| panic!("tempdir failed: {}", e));
         let file_name = "test";
 
         {
-            let mount_point = TempDir::new("nix-test_mount")
+            let mount_point = tempfile::Builder::new()
+                                  .prefix("nix-test_mount")
+                                  .tempdir()
                                   .unwrap_or_else(|e| panic!("tempdir failed: {}", e));
 
             mount(Some(tempdir.path()),

test/test_stat.rs

@@ -9,7 +9,7 @@ use nix::sys::stat::{self, fchmod, fchmodat, fstat, lstat, stat};
 use nix::sys::stat::{FileStat, Mode, FchmodatFlags};
 use nix::unistd::chdir;
 use nix::Result;
-use tempdir::TempDir;
+use tempfile;
 
 #[allow(unused_comparisons)]
 // uid and gid are signed on Windows, but not on other platforms. This function
@@ -56,7 +56,10 @@ fn assert_lstat_results(stat_result: Result<FileStat>) {
 
 #[test]
 fn test_stat_and_fstat() {
-    let tempdir = TempDir::new("nix-test_stat_and_fstat").unwrap();
+    let tempdir = tempfile::Builder::new()
+                      .prefix("nix-test_stat_and_fstat")
+                      .tempdir()
+                      .unwrap();
     let filename = tempdir.path().join("foo.txt");
     let file = File::create(&filename).unwrap();
 
@@ -69,7 +72,10 @@ fn test_stat_and_fstat() {
 
 #[test]
 fn test_fstatat() {
-    let tempdir = TempDir::new("nix-test_fstatat").unwrap();
+    let tempdir = tempfile::Builder::new()
+                      .prefix("nix-test_fstatat")
+                      .tempdir()
+                      .unwrap();
     let filename = tempdir.path().join("foo.txt");
     File::create(&filename).unwrap();
     let dirfd = fcntl::open(tempdir.path(),
@@ -84,7 +90,10 @@ fn test_fstatat() {
 
 #[test]
 fn test_stat_fstat_lstat() {
-    let tempdir = TempDir::new("nix-test_stat_fstat_lstat").unwrap();
+    let tempdir = tempfile::Builder::new()
+                      .prefix("nix-test_stat_fstat_lstat")
+                      .tempdir()
+                      .unwrap();
     let filename = tempdir.path().join("bar.txt");
     let linkname = tempdir.path().join("barlink");
 
@@ -106,7 +115,10 @@ fn test_stat_fstat_lstat() {
 
 #[test]
 fn test_fchmod() {
-    let tempdir = TempDir::new("nix-test_fchmod").unwrap();
+    let tempdir = tempfile::Builder::new()
+                      .prefix("nix-test_fchmod")
+                      .tempdir()
+                      .unwrap();
     let filename = tempdir.path().join("foo.txt");
     let file = File::create(&filename).unwrap();
 
@@ -128,7 +140,10 @@ fn test_fchmod() {
 
 #[test]
 fn test_fchmodat() {
-    let tempdir = TempDir::new("nix-test_fchmodat").unwrap();
+    let tempdir = tempfile::Builder::new()
+                      .prefix("nix-test_fchmodat")
+                      .tempdir()
+                      .unwrap();
     let filename = "foo.txt";
     let fullpath = tempdir.path().join(filename);
     File::create(&fullpath).unwrap();

test/test_unistd.rs

@@ -1,5 +1,3 @@
-extern crate tempdir;
-
 use nix::fcntl::{fcntl, FcntlArg, FdFlag, OFlag};
 use nix::unistd::*;
 use nix::unistd::ForkResult::*;
@@ -11,8 +9,7 @@ use std::ffi::CString;
 use std::fs::File;
 use std::io::Write;
 use std::os::unix::prelude::*;
-use tempfile::tempfile;
-use tempdir::TempDir;
+use tempfile::{self, tempfile};
 use libc::{self, _exit, off_t};
 
 #[test]
@@ -84,7 +81,10 @@ fn test_mkstemp_directory() {
 
 #[test]
 fn test_mkfifo() {
-    let tempdir = TempDir::new("nix-test_mkfifo").unwrap();
+    let tempdir = tempfile::Builder::new()
+                      .prefix("nix-test_mkfifo")
+                      .tempdir()
+                      .unwrap();
     let mkfifo_fifo = tempdir.path().join("mkfifo_fifo");
 
     mkfifo(&mkfifo_fifo, Mode::S_IRUSR).unwrap();
@@ -286,7 +286,10 @@ fn test_fchdir() {
     #[allow(unused_variables)]
     let m = ::CWD_MTX.lock().expect("Mutex got poisoned by another test");
 
-    let tmpdir = TempDir::new("test_fchdir").unwrap();
+    let tmpdir = tempfile::Builder::new()
+                     .prefix("test_fchdir")
+                     .tempdir()
+                     .unwrap();
     let tmpdir_path = tmpdir.path().canonicalize().unwrap();
     let tmpdir_fd = File::open(&tmpdir_path).unwrap().into_raw_fd();
 
@@ -302,7 +305,10 @@ fn test_getcwd() {
     #[allow(unused_variables)]
     let m = ::CWD_MTX.lock().expect("Mutex got poisoned by another test");
 
-    let tmpdir = TempDir::new("test_getcwd").unwrap();
+    let tmpdir = tempfile::Builder::new()
+                     .prefix("test_getcwd")
+                     .tempdir()
+                     .unwrap();
     let tmpdir_path = tmpdir.path().canonicalize().unwrap();
     assert!(chdir(&tmpdir_path).is_ok());
     assert_eq!(getcwd().unwrap(), tmpdir_path);