Update code to 2018 edition, upgraded all dependencies, replaced try! with ?, and removed deprecated Error methods

Author: dani-garcia

Cargo.toml

@@ -7,6 +7,7 @@ repository = "https://github.com/mattnenterprise/rust-ftp"
 description = "FTP client for Rust"
 readme = "README.md"
 license = "Apache-2.0/MIT"
+edition = "2018"
 keywords = ["ftp"]
 categories = ["network-programming"]
 
@@ -26,10 +27,10 @@ secure = ["openssl"]
 debug_print = []
 
 [dependencies]
-lazy_static = "0.1"
-regex = "0.1"
-chrono = "0.2"
+lazy_static = "1.4.0"
+regex = "1.3.9"
+chrono = "0.4.11"
 
 [dependencies.openssl]
-version = "0.9"
+version = "0.10.29"
 optional = true

src/data_stream.rs

@@ -12,26 +12,25 @@ pub enum DataStream {
     Ssl(SslStream<TcpStream>),
 }
 
-#[cfg(feature = "secure")]
 impl DataStream {
     /// Unwrap the stream into TcpStream. This method is only used in secure connection.
     pub fn into_tcp_stream(self) -> TcpStream {
         match self {
             DataStream::Tcp(stream) => stream,
+            #[cfg(feature = "secure")]
             DataStream::Ssl(stream) => stream.get_ref().try_clone().unwrap(),
         }
     }
 
     /// Test if the stream is secured
     pub fn is_ssl(&self) -> bool {
         match self {
+            #[cfg(feature = "secure")]
             &DataStream::Ssl(_) => true,
             _ => false
         }
     }
-}
 
-impl DataStream {
     /// Returns a reference to the underlying TcpStream.
     pub fn get_ref(&self) -> &TcpStream {
         match self {