Merge pull request #95 from openssh-rust/rm-lazystatic

Rm lazystatic used in testing

Author: jonhoo

Cargo.toml

@@ -53,7 +53,6 @@ dirs = "4.0.0"
 openssh-mux-client = { version = "0.15.0", optional = true }
 
 [dev-dependencies]
-lazy_static = "1.4.0"
 regex = "1"
 tokio = { version = "1", features = [ "full" ] }
 openssh-sftp-client = "0.11.0"

tests/openssh.rs

@@ -1,4 +1,4 @@
-use lazy_static::lazy_static;
+use once_cell::sync::Lazy;
 use regex::Regex;
 use std::env;
 use std::io;
@@ -136,12 +136,12 @@ struct ProtoUserHostPort<'a> {
 }
 
 fn parse_user_host_port(s: &str) -> Option<ProtoUserHostPort> {
-    lazy_static! {
-        static ref SSH_REGEX: Regex = Regex::new(
-            r"(?x)^((?P<proto>[[:alpha:]]+)://)?((?P<user>.*?)@)?(?P<host>.*?)(:(?P<port>\d+))?$"
+    static SSH_REGEX: Lazy<Regex> = Lazy::new(|| {
+        Regex::new(
+            r"(?x)^((?P<proto>[[:alpha:]]+)://)?((?P<user>.*?)@)?(?P<host>.*?)(:(?P<port>\d+))?$",
         )
-        .unwrap();
-    }
+        .unwrap()
+    });
 
     SSH_REGEX.captures(s).map(|cap| ProtoUserHostPort {
         proto: cap.name("proto").map(|m| m.as_str()),
@@ -579,7 +579,7 @@ async fn process_exit_on_signal() {
         assert!(matches!(failed, Error::RemoteProcessTerminated));
 
         // the connection should still work though
-        let _ = session.check().await.unwrap();
+        session.check().await.unwrap();
     }
 }