Fix clippy warning

pull/96/head
Chip Senkbeil 3 years ago
parent 201101cb7f
commit 78f827faea
No known key found for this signature in database
GPG Key ID: 35EF1F8EC72A4131

8
Cargo.lock generated

@ -427,7 +427,7 @@ dependencies = [
[[package]] [[package]]
name = "distant" name = "distant"
version = "0.15.0-alpha.12" version = "0.15.0-alpha.14"
dependencies = [ dependencies = [
"assert_cmd", "assert_cmd",
"assert_fs", "assert_fs",
@ -451,7 +451,7 @@ dependencies = [
[[package]] [[package]]
name = "distant-core" name = "distant-core"
version = "0.15.0-alpha.12" version = "0.15.0-alpha.14"
dependencies = [ dependencies = [
"assert_fs", "assert_fs",
"bytes", "bytes",
@ -476,7 +476,7 @@ dependencies = [
[[package]] [[package]]
name = "distant-lua" name = "distant-lua"
version = "0.15.0-alpha.12" version = "0.15.0-alpha.14"
dependencies = [ dependencies = [
"distant-core", "distant-core",
"distant-ssh2", "distant-ssh2",
@ -510,7 +510,7 @@ dependencies = [
[[package]] [[package]]
name = "distant-ssh2" name = "distant-ssh2"
version = "0.15.0-alpha.12" version = "0.15.0-alpha.14"
dependencies = [ dependencies = [
"assert_cmd", "assert_cmd",
"assert_fs", "assert_fs",

@ -412,16 +412,16 @@ impl Ssh2Session {
// Close out ssh session // Close out ssh session
session.abort(); session.abort();
let _ = session.wait().await; let _ = session.wait().await;
let mut output = String::new();
// If successful, grab the session information and establish a connection // If successful, grab the session information and establish a connection
// with the distant server // with the distant server
if success { if success {
let mut out = String::new();
while let Ok(data) = stdout.read().await { while let Ok(data) = stdout.read().await {
out.push_str(&data); output.push_str(&data);
} }
let maybe_info = out let maybe_info = output
.lines() .lines()
.find_map(|line| line.parse::<SessionInfo>().ok()); .find_map(|line| line.parse::<SessionInfo>().ok());
match maybe_info { match maybe_info {
@ -450,9 +450,8 @@ impl Ssh2Session {
)), )),
} }
} else { } else {
let mut err = String::new();
while let Ok(data) = stderr.read().await { while let Ok(data) = stderr.read().await {
err.push_str(&data); output.push_str(&data);
} }
Err(io::Error::new( Err(io::Error::new(
@ -461,7 +460,7 @@ impl Ssh2Session {
"Spawning distant failed [{}]: {}", "Spawning distant failed [{}]: {}",
code.map(|x| x.to_string()) code.map(|x| x.to_string())
.unwrap_or_else(|| String::from("???")), .unwrap_or_else(|| String::from("???")),
err output
), ),
)) ))
} }

Loading…
Cancel
Save