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
|
commit d9a1dfac4b8c09c5437eb477606b82aa4f67b092
Author: Alexander Kjäll <alexander.kjall@gmail.com>
Date: Wed Mar 1 19:25:27 2023 +0100
replace tempdir with tempfile, as tempdir is deprecated
Index: ssh2/Cargo.toml
===================================================================
--- ssh2.orig/Cargo.toml
+++ ssh2/Cargo.toml
@@ -40,7 +40,7 @@ version = "0.3.0"
[dependencies.parking_lot]
version = "0.12"
-[dev-dependencies.tempdir]
-version = "0.3"
+[dev-dependencies.tempfile]
+version = "3"
[features]
Index: ssh2/tests/all/main.rs
===================================================================
--- ssh2.orig/tests/all/main.rs
+++ ssh2/tests/all/main.rs
@@ -1,7 +1,7 @@
#![deny(warnings)]
extern crate ssh2;
-extern crate tempdir;
+extern crate tempfile;
use std::env;
use std::net::TcpStream;
Index: ssh2/tests/all/session.rs
===================================================================
--- ssh2.orig/tests/all/session.rs
+++ ssh2/tests/all/session.rs
@@ -2,7 +2,7 @@ use std::env;
use std::fs::File;
use std::io::{self, prelude::*};
use std::path::Path;
-use tempdir::TempDir;
+use tempfile::TempDir;
use ssh2::{BlockDirections, HashType, KeyboardInteractivePrompt, MethodType, Prompt, Session};
@@ -163,7 +163,7 @@ fn scp_recv() {
#[test]
fn scp_send() {
- let td = TempDir::new("test").unwrap();
+ let td = TempDir::new().unwrap();
let sess = ::authed_session();
let mut ch = sess
.scp_send(&td.path().join("foo"), 0o644, 6, None)
Index: ssh2/tests/all/sftp.rs
===================================================================
--- ssh2.orig/tests/all/sftp.rs
+++ ssh2/tests/all/sftp.rs
@@ -1,6 +1,6 @@
use std::fs::{self, File};
use std::io::prelude::*;
-use tempdir::TempDir;
+use tempfile::TempDir;
#[test]
fn smoke() {
@@ -10,7 +10,7 @@ fn smoke() {
#[test]
fn ops() {
- let td = TempDir::new("foo").unwrap();
+ let td = TempDir::new().unwrap();
File::create(&td.path().join("foo")).unwrap();
fs::create_dir(&td.path().join("bar")).unwrap();
@@ -53,7 +53,7 @@ fn ops() {
#[test]
fn not_found() {
- let td = TempDir::new("foo").unwrap();
+ let td = TempDir::new().unwrap();
let sess = ::authed_session();
let sftp = sess.sftp().unwrap();
|
