refactor(global): Move from tempdir to tempfile:

* the crate has been deprecated

Author: sylvestre

Cargo.lock

@@ -332,7 +332,7 @@ filetime = "0.2"
 libc = "0.2"
 rand = "0.6"
 regex = "1.0"
-tempdir = "0.3"
+tempfile = "3.1"
 time = "0.1"
 unindent = "0.1"
 uucore = { version="0.0.4", package="uucore", git="https://github.com/uutils/uucore.git", branch="master", features=["entries"] }

Cargo.toml

@@ -16,7 +16,7 @@ path = "src/stdbuf.rs"
 
 [dependencies]
 getopts = "0.2.18"
-tempdir = "0.3.7"
+tempfile = "3.1"
 uucore = { version="0.0.4", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary" }
 uucore_procs = { version="0.0.4", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 

src/uu/stdbuf/Cargo.toml

@@ -8,7 +8,7 @@
 // spell-checker:ignore (ToDO) tempdir dyld dylib dragonflybsd optgrps libstdbuf
 
 extern crate getopts;
-extern crate tempdir;
+extern crate tempfile;
 
 #[macro_use]
 extern crate uucore;
@@ -19,7 +19,8 @@ use std::io::{self, Write};
 use std::os::unix::process::ExitStatusExt;
 use std::path::PathBuf;
 use std::process::Command;
-use tempdir::TempDir;
+use tempfile::tempdir;
+use tempfile::TempDir;
 
 static NAME: &str = "stdbuf";
 static VERSION: &str = env!("CARGO_PKG_VERSION");
@@ -273,7 +274,7 @@ pub fn uumain(args: Vec<String>) -> i32 {
     let command_name = &args[command_idx as usize];
     let mut command = Command::new(command_name);
 
-    let mut tmp_dir = return_if_err!(1, TempDir::new("stdbuf"));
+    let mut tmp_dir = tempdir().unwrap();
     let (preload_env, libstdbuf) = return_if_err!(1, get_preload_env(&mut tmp_dir));
     command
         .args(&args[(command_idx as usize) + 1..])

src/uu/stdbuf/src/stdbuf.rs

@@ -1,4 +1,4 @@
-extern crate tempdir;
+extern crate tempfile;
 #[cfg(unix)]
 extern crate unix_socket;
 

tests/by-util/test_cat.rs

@@ -1,6 +1,7 @@
 use crate::common::util::*;
-extern crate tempdir;
-use self::tempdir::TempDir;
+
+extern crate tempfile;
+use self::tempfile::tempdir;
 
 static TEST_TEMPLATE1: &'static str = "tempXXXXXX";
 static TEST_TEMPLATE2: &'static str = "temp";
@@ -266,9 +267,9 @@ fn test_mktemp_suffix() {
 #[test]
 fn test_mktemp_tmpdir() {
     let scene = TestScenario::new(util_name!());
-
-    let path = TempDir::new_in(scene.fixtures.as_string(), util_name!()).unwrap();
-    let pathname = path.path().as_os_str();
+    let dir = tempdir().unwrap();
+    let path = dir.path().join(scene.fixtures.as_string());
+    let pathname = path.as_os_str();
 
     scene
         .ucmd()

tests/by-util/test_mktemp.rs

@@ -1,7 +1,7 @@
 #![allow(dead_code)]
-extern crate tempdir;
+extern crate tempfile;
 
-use self::tempdir::TempDir;
+use self::tempfile::TempDir;
 use std::env;
 use std::ffi::OsStr;
 use std::fs::{self, File, OpenOptions};
@@ -406,7 +406,7 @@ pub struct TestScenario {
 
 impl TestScenario {
     pub fn new(util_name: &str) -> TestScenario {
-        let tmpd = Rc::new(TempDir::new("uutils").unwrap());
+        let tmpd = Rc::new(TempDir::new().unwrap());
         let ts = TestScenario {
             bin_path: {
                 // Instead of hardcoding the path relative to the current