Upgrade deps

cli/Cargo.toml

@@ -14,8 +14,8 @@ skytable = { git = "https://github.com/skytable/client-rust", branch = "next", f
   "aio-sslv",
 ], default-features = false }
 # external deps
-tokio = { version = "1.21.0", features = ["full"] }
+tokio = { version = "1.28.1", features = ["full"] }
 clap = { version = "2", features = ["yaml"] }
-rustyline = "10.0.0"
-crossterm = "0.25.0"
+rustyline = "10.1.1"
+crossterm = "0.26.1"
 lazy_static = "1.4.0"

harness/Cargo.toml

@@ -12,8 +12,8 @@ skytable = { git = "https://github.com/skytable/client-rust.git", features = [
 ], default-features = false }
 libsky = { path = "../libsky" }
 # external deps
-env_logger = "0.9.0"
+env_logger = "0.10.0"
 log = "0.4.17"
-zip = { version = "0.6.2", features = ["deflate"] }
-powershell_script = "1.0.4"
-openssl = { version = "0.10.41", features = ["vendored"] }
+zip = { version = "0.6.6", features = ["deflate"] }
+powershell_script = "1.1.0"
+openssl = { version = "0.10.52", features = ["vendored"] }

libstress/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 
 [dependencies]
 # external deps
-crossbeam-channel = "0.5.6"
-rayon = "1.5.3"
+crossbeam-channel = "0.5.8"
+rayon = "1.7.0"
 log = "0.4.17"
 rand = "0.8.5"

server/Cargo.toml

@@ -11,23 +11,23 @@ libsky = { path = "../libsky" }
 sky_macros = { path = "../sky-macros" }
 rcrypt = "0.4.0"
 # external deps
-ahash = "0.8.0"
-bytes = "1.2.1"
-chrono = "0.4.22"
+ahash = "0.8.3"
+bytes = "1.4.0"
+chrono = "0.4.24"
 clap = { version = "2", features = ["yaml"] }
-env_logger = "0.9.0"
-hashbrown = { version = "0.12.3", features = ["raw"] }
+env_logger = "0.10.0"
+hashbrown = { version = "0.13.2", features = ["raw"] }
 log = "0.4.17"
-openssl = { version = "0.10.41", features = ["vendored"] }
-crossbeam-epoch = { version = "0.9.13" }
+openssl = { version = "0.10.52", features = ["vendored"] }
+crossbeam-epoch = { version = "0.9.14" }
 parking_lot = "0.12.1"
 regex = "1.6.0"
-serde = { version = "1.0.144", features = ["derive"] }
-tokio = { version = "1.21.0", features = ["full"] }
+serde = { version = "1.0.163", features = ["derive"] }
+tokio = { version = "1.28.1", features = ["full"] }
 tokio-openssl = "0.6.3"
-toml = "0.5.9"
-base64 = "0.13.0"
-uuid = { version = "1.2.2", features = ["v4", "fast-rng", "macro-diagnostics"] }
+toml = "0.7.4"
+base64 = "0.21.2"
+uuid = { version = "1.3.3", features = ["v4", "fast-rng", "macro-diagnostics"] }
 crc = "3.0.1"
 
 [target.'cfg(all(not(target_env = "msvc"), not(miri)))'.dependencies]
@@ -39,11 +39,11 @@ winapi = { version = "0.3.9", features = ["fileapi"] }
 
 [target.'cfg(unix)'.dependencies]
 # external deps
-libc = "0.2.132"
+libc = "0.2.144"
 
 [target.'cfg(unix)'.build-dependencies]
 # external deps
-cc = "1.0.73"
+cc = "1.0.79"
 
 [dev-dependencies]
 # internal deps
@@ -55,7 +55,7 @@ skytable = { git = "https://github.com/skytable/client-rust", features = [
 # external deps
 bincode = "1.3.3"
 rand = "0.8.5"
-tokio = { version = "1.21.0", features = ["test-util"] }
+tokio = { version = "1.28.1", features = ["test-util"] }
 
 [features]
 nightly = []

server/src/auth/keys.rs

@@ -27,10 +27,16 @@
 use {
     super::provider::{Authkey, AUTHKEY_SIZE},
     crate::corestore::array::Array,
+    base64::{
+        alphabet::BCRYPT,
+        engine::{GeneralPurpose, GeneralPurposeConfig},
+        Engine,
+    },
 };
 
 type AuthkeyArray = Array<u8, { AUTHKEY_SIZE }>;
 const RAN_BYTES_SIZE: usize = 40;
+const BASE64: GeneralPurpose = GeneralPurpose::new(&BCRYPT, GeneralPurposeConfig::new());
 
 /// Return a "human readable key" and the "authbytes" that can be stored
 /// safely. To do this:
@@ -41,7 +47,7 @@ const RAN_BYTES_SIZE: usize = 40;
 pub fn generate_full() -> (String, Authkey) {
     let mut bytes: [u8; RAN_BYTES_SIZE] = [0u8; RAN_BYTES_SIZE];
     openssl::rand::rand_bytes(&mut bytes).unwrap();
-    let ret = base64::encode_config(&bytes, base64::BCRYPT);
+    let ret = BASE64.encode(&bytes);
     let hash = rcrypt::hash(&ret, rcrypt::DEFAULT_COST).unwrap();
     let store_in_db = unsafe {
         let mut array = AuthkeyArray::new();

server/src/config/mod.rs

@@ -672,8 +672,8 @@ pub fn get_config() -> Result<ConfigType, ConfigError> {
 
     // get config from file
     let cfg_from_file = if let Some(file) = matches.value_of("config") {
-        let file = fs::read(file)?;
-        let cfg_file: ConfigFile = toml::from_slice(&file)?;
+        let file = fs::read_to_string(file)?;
+        let cfg_file: ConfigFile = toml::from_str(&file)?;
         Some(cfgfile::from_file(cfg_file))
     } else {
         None

sky-bench/Cargo.toml

@@ -16,8 +16,8 @@ libstress = { path = "../libstress" }
 # external deps
 clap = { version = "2", features = ["yaml"] }
 log = "0.4.17"
-env_logger = "0.9.0"
+env_logger = "0.10.0"
 devtimer = "4.0.1"
-serde = { version = "1.0.144", features = ["derive"] }
-serde_json = "1.0.85"
+serde = { version = "1.0.163", features = ["derive"] }
+serde_json = "1.0.96"
 rand = "0.8.5"

sky-macros/Cargo.toml

@@ -11,7 +11,7 @@ proc-macro = true
 
 [dependencies]
 # external deps
-proc-macro2 = "1.0.43"
-quote = "1.0.21"
+proc-macro2 = "1.0.58"
+quote = "1.0.27"
 rand = "0.8.5"
-syn = { version = "1.0.99", features = ["full"] }
+syn = { version = "1.0.109", features = ["full"] }

sky-migrate/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 
 [dependencies]
 skytable = { git = "https://github.com/skytable/client-rust.git" }
-env_logger = "0.9.0"
+env_logger = "0.10.0"
 bincode = "1.3.3"
 log = "0.4.17"
 clap = { version = "2", features = ["yaml"] }

stress-test/Cargo.toml

@@ -14,8 +14,8 @@ skytable = { git = "https://github.com/skytable/client-rust.git", branch = "next
 ] }
 devtimer = "4.0.1"
 # external deps
-sysinfo = "0.26.2"
-env_logger = "0.9.0"
+sysinfo = "0.29.0"
+env_logger = "0.10.0"
 log = "0.4.17"
 rand = "0.8.5"
-crossbeam-channel = "0.5.6"
+crossbeam-channel = "0.5.8"