diff --git a/Cargo.lock b/Cargo.lock index 9fe1889..e9ff056 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -466,11 +466,9 @@ dependencies = [ "once_cell", "predicates", "rand", - "rpassword", "serde", "serde_cbor", "serde_json", - "ssh2", "structopt", "strum", "tokio", diff --git a/distant-core/Cargo.toml b/distant-core/Cargo.toml index a37bbdf..53b82e9 100644 --- a/distant-core/Cargo.toml +++ b/distant-core/Cargo.toml @@ -10,9 +10,6 @@ repository = "https://github.com/chipsenkbeil/distant" readme = "README.md" license = "MIT OR Apache-2.0" -[features] -native-ssh2 = ["rpassword", "ssh2"] - [dependencies] bytes = "1.1.0" chacha20poly1305 = "0.9.0" @@ -31,8 +28,6 @@ tokio-util = { version = "0.6.7", features = ["codec"] } walkdir = "2.3.2" # Optional dependencies based on features -rpassword = { version = "5.0.1", optional = true } -ssh2 = { version = "0.9.1", features = ["vendored-openssl"], optional = true } structopt = { version = "0.3.22", optional = true } [dev-dependencies] diff --git a/distant-core/src/client/session/ext.rs b/distant-core/src/client/session/ext.rs index 191cbc2..e04b4d8 100644 --- a/distant-core/src/client/session/ext.rs +++ b/distant-core/src/client/session/ext.rs @@ -4,6 +4,7 @@ use crate::{ net::TransportError, }; use derive_more::{Display, Error, From}; +use serde::{Deserialize, Serialize}; use std::{future::Future, path::PathBuf, pin::Pin}; /// Represents an error that can occur related to convenience functions tied to a @@ -24,6 +25,7 @@ pub type AsyncReturn<'a, T, E = SessionChannelExtError> = Pin> + Send + 'a>>; /// Represents metadata about some path on a remote machine +#[derive(Clone, Debug, Serialize, Deserialize)] pub struct Metadata { pub file_type: FileType, pub len: u64,