Upgrade deps and remove unused regex in cli

Closes #128, closes #129 and closes #132

Cargo.lock

@@ -299,9 +299,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.93"
+version = "0.2.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41"
+checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
 
 [[package]]
 name = "libsky"
@@ -591,9 +591,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.4.5"
+version = "1.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19"
+checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -714,10 +714,8 @@ version = "0.5.1"
 dependencies = [
  "bytes",
  "clap",
- "lazy_static",
  "libsky",
  "openssl",
- "regex",
  "tokio",
  "tokio-openssl",
 ]
@@ -753,9 +751,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
 [[package]]
 name = "syn"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb"
+checksum = "b9505f307c872bab8eb46f77ae357c8eba1fdacead58ee5a850116b1d7f82883"
 dependencies = [
  "proc-macro2",
  "quote",

cli/Cargo.toml

@@ -10,8 +10,6 @@ edition = "2018"
 libsky = {path = "../libsky"}
 tokio = {version = "1.5.0", features = ["full"]}
 bytes = "1.0.1"
-regex = "1.4.5"
-lazy_static = "1.4.0"
 clap = {version = "2.33.3", features=["yaml"]}
 openssl = { version = "0.10.33", features = ["vendored"] }
 tokio-openssl = "0.6.1"

cli/src/protocol/mod.rs

@@ -27,14 +27,12 @@
 mod deserializer;
 use bytes::{Buf, BytesMut};
 use deserializer::ClientResult;
-use lazy_static::lazy_static;
 use libsky::terrapipe;
 use libsky::TResult;
 use libsky::BUF_CAP;
 use openssl::ssl::Ssl;
 use openssl::ssl::SslContext;
 use openssl::ssl::SslMethod;
-use regex::Regex;
 use std::io::Result as IoResult;
 use std::net::SocketAddr;
 use std::pin::Pin;
@@ -42,10 +40,6 @@ use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::TcpStream;
 use tokio_openssl::SslStream;
 
-lazy_static! {
-    static ref RE: Regex = Regex::new("[^\\s\"']+|\"[^\"]*\"|'[^']*'").unwrap();
-}
-
 pub enum Con {
     Secure(SslConnection),
     Insecure(Connection),

libsky/Cargo.toml

@@ -10,4 +10,4 @@ edition = "2018"
 lazy_static = "1.4.0"
 bytes = "1.0.1"
 termcolor = "1.1.2"
-regex = "1.4.5"
+regex = "1.4.6"

server/Cargo.toml

@@ -20,7 +20,7 @@ clap = {version = "2.33.3", features=["yaml"]}
 env_logger = "0.8.3"
 log = "0.4.14"
 chrono = "0.4.19"
-regex = "1.4.5"
+regex = "1.4.6"
 sky_macros = {path="../sky-macros"}
 tokio-openssl = "0.6.1"
 openssl = { version = "0.10.33", features = ["vendored"] }
@@ -37,4 +37,4 @@ cc = "1.0.67"
 tokio = { version = "1.5.0", features = ["test-util"] }
 
 [target.'cfg(unix)'.dependencies]
-libc = "0.2.93"
+libc = "0.2.94"

sky-macros/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2018"
 proc-macro = true
 
 [dependencies]
-syn = {version = "1.0.69", features = ["full"]}
+syn = {version = "1.0.70", features = ["full"]}
 quote = "1.0.9"
 rand = "0.8.3"
 proc-macro2 = "1.0.26"