Skip to content

Commit cc625bb

Browse files
committed
Make openssh-sftp-client dev-dep and bump to v0.10.0
So that we don't have to impl `openssh_sftp_client::Writer` for `ChildStdin`. Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
1 parent cc80ea1 commit cc625bb

File tree

3 files changed

+1
-17
lines changed

3 files changed

+1
-17
lines changed

Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,11 @@ dirs = "4.0.0"
5151

5252
openssh-mux-client = { version = "0.15.0", optional = true }
5353

54-
openssh-sftp-client = { version = "0.9.0", optional = true }
55-
5654
[dev-dependencies]
5755
lazy_static = "1.4.0"
5856
regex = "1"
5957
tokio = { version = "1", features = [ "full" ] }
58+
openssh-sftp-client = "0.10.0"
6059

6160
[[example]]
6261
name = "native-mux_tsp"

src/stdio.rs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -128,20 +128,6 @@ impl_try_from_tokio_process_child_for_stdio!(ChildStderr);
128128
#[derive(Debug)]
129129
pub struct ChildStdin(tokio_pipe::PipeWrite);
130130

131-
#[cfg(feature = "openssh-sftp-client")]
132-
impl openssh_sftp_client::Writer for ChildStdin {
133-
const MAX_ATOMIC_WRITE_LEN: usize =
134-
<tokio_pipe::PipeWrite as openssh_sftp_client::Writer>::MAX_ATOMIC_WRITE_LEN;
135-
136-
fn poll_write_vectored_atomic(
137-
&self,
138-
cx: &mut Context<'_>,
139-
bufs: &[io::IoSlice<'_>],
140-
) -> Poll<io::Result<()>> {
141-
self.0.poll_write_vectored_atomic(cx, bufs)
142-
}
143-
}
144-
145131
/// Stdout for the remote child.
146132
#[derive(Debug)]
147133
pub struct ChildStdout(tokio_pipe::PipeRead);

tests/openssh.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,6 @@ async fn local_socket_forward() {
823823
}
824824
}
825825

826-
#[cfg(feature = "openssh-sftp-client")]
827826
#[tokio::test]
828827
#[cfg_attr(not(ci), ignore)]
829828
async fn test_sftp_subsystem() {

0 commit comments

Comments
 (0)