feat: use cfg_if and once_cell

Author: Jeff Tsai

rsocket-transport-tcp/Cargo.toml

@@ -14,21 +14,22 @@ default = []
 tls = ["tokio-native-tls"]
 
 [dependencies]
-log = "0.4.13"
-futures = "0.3.10"
+log = "0.4.14"
+futures = "0.3.13"
 bytes = "1.0.1"
+cfg-if = "1"
 
 [dependencies.rsocket_rust]
 path = "../rsocket"
 features = ["frame"]
 
 [dependencies.tokio]
-version = "1.0.1"
+version = "1.0.3"
 default-features = false
 features = [ "rt", "rt-multi-thread", "net", "sync", "io-util", "macros" ]
 
 [dependencies.tokio-util]
-version = "0.6.1"
+version = "0.6.3"
 default-features = false
 features = ["codec"]
 

rsocket-transport-tcp/src/client/mod.rs

@@ -1,9 +1,12 @@
 mod tcp;
-#[cfg(feature = "tls")]
-mod tls;
 mod uds;
 
 pub use tcp::TcpClientTransport;
-#[cfg(feature = "tls")]
-pub use tls::TlsClientTransport;
 pub use uds::UnixClientTransport;
+
+cfg_if! {
+    if #[cfg(feature = "tls")] {
+        mod tls;
+        pub use tls::TlsClientTransport;
+    }
+}

rsocket-transport-tcp/src/connection/mod.rs

@@ -1,10 +1,13 @@
 mod codec;
 mod tcp;
-#[cfg(feature = "tls")]
-mod tls;
 mod uds;
 
 pub use tcp::TcpConnection;
-#[cfg(feature = "tls")]
-pub use tls::TlsConnection;
 pub use uds::UnixConnection;
+
+cfg_if! {
+    if #[cfg(feature = "tls")] {
+        mod tls;
+        pub use tls::TlsConnection;
+    }
+}

rsocket-transport-tcp/src/lib.rs

@@ -2,20 +2,23 @@
 
 #[macro_use]
 extern crate log;
+#[macro_use]
+extern crate cfg_if;
 
 mod client;
 mod connection;
 mod misc;
 mod server;
 
-#[cfg(feature = "tls")]
-pub use client::TlsClientTransport;
 pub use client::{TcpClientTransport, UnixClientTransport};
-#[cfg(feature = "tls")]
-pub use connection::TlsConnection;
 pub use connection::{TcpConnection, UnixConnection};
-#[cfg(feature = "tls")]
-pub use server::TlsServerTransport;
 pub use server::{TcpServerTransport, UnixServerTransport};
-#[cfg(feature = "tls")]
-pub use tokio_native_tls;
+
+cfg_if! {
+    if #[cfg(feature = "tls")] {
+        pub use tokio_native_tls;
+        pub use client::TlsClientTransport;
+        pub use connection::TlsConnection;
+        pub use server::TlsServerTransport;
+    }
+}

rsocket-transport-tcp/src/server/mod.rs

@@ -1,10 +1,12 @@
 mod tcp;
-
-#[cfg(feature = "tls")]
-mod tls;
 mod uds;
 
 pub use tcp::TcpServerTransport;
-#[cfg(feature = "tls")]
-pub use tls::TlsServerTransport;
 pub use uds::UnixServerTransport;
+
+cfg_if! {
+    if #[cfg(feature = "tls")] {
+        mod tls;
+        pub use tls::TlsServerTransport;
+    }
+}

rsocket-transport-wasm/Cargo.toml

@@ -11,25 +11,25 @@ description = "WASM Websocket RSocket transport implementation."
 
 [dependencies]
 bytes = "1.0.1"
-wasm-bindgen-futures = "0.4.19"
-futures-channel = "0.3.10"
-futures-util = "0.3.10"
-js-sys = "0.3.46"
-serde = "1.0.119"
-serde_derive = "1.0.119"
+wasm-bindgen-futures = "0.4.20"
+futures-channel = "0.3.13"
+futures-util = "0.3.13"
+js-sys = "0.3.47"
+serde = "1.0.123"
+serde_derive = "1.0.123"
 async-trait = "0.1.42"
-log = "0.4.13"
+log = "0.4.14"
 
 [dependencies.rsocket_rust]
 path = "../rsocket"
 features = ["frame"]
 
 [dependencies.wasm-bindgen]
-version = "0.2.69"
+version = "0.2.70"
 features = ["serde-serialize"]
 
 [dependencies.web-sys]
-version = "0.3.46"
+version = "0.3.47"
 features = [
   "FileReader",
   "ProgressEvent",

rsocket-transport-websocket/Cargo.toml

@@ -10,17 +10,17 @@ homepage = "https://github.com/rsocket/rsocket-rust"
 description = "Websocket RSocket transport implementation."
 
 [dependencies]
-log = "0.4.13"
-futures = "0.3.10"
+log = "0.4.14"
+futures = "0.3.13"
 bytes = "1.0.1"
-url = "2.2.0"
+url = "2.2.1"
 tokio-tungstenite = "0.13.0"
 
 [dependencies.rsocket_rust]
 path = "../rsocket"
 features = ["frame"]
 
 [dependencies.tokio]
-version = "1.0.1"
+version = "1.0.3"
 default-features = false
 features = [ "rt", "rt-multi-thread", "net", "sync"]

rsocket/Cargo.toml

@@ -13,18 +13,19 @@ description = "rsocket-rust is an implementation of the RSocket protocol in Rust
 log = "0.4.13"
 bytes = "1.0.1"
 futures = "0.3.10"
-lazy_static = "1.4.0"
+once_cell = "1.6.0"
 async-trait = "0.1.42"
 dashmap = "4.0.2"
 thiserror = "1.0.23"
 anyhow = "1.0.38"
 async-stream = "0.3.0"
+cfg-if = "1"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 wasm-bindgen-futures = "0.4.19"
 
 [dependencies.tokio]
-version = "1.0.1"
+version = "1.0.3"
 default-features = false
 features = [ "macros", "rt", "rt-multi-thread", "sync", "time" ]
 

rsocket/src/extension/mime.rs

@@ -1,28 +1,29 @@
 use std::collections::HashMap;
 use std::fmt;
 
+use once_cell::sync::Lazy;
+
 #[derive(PartialEq, Eq, Debug, Clone, Hash)]
 pub enum MimeType {
     Normal(String),
     WellKnown(u8),
 }
 
-lazy_static! {
-    static ref U8_TO_STR: HashMap<u8, &'static str> = {
-        let mut m = HashMap::new();
-        for it in list_all().iter() {
-            m.insert(it.0, it.1);
-        }
-        m
-    };
-    static ref STR_TO_U8: HashMap<&'static str, u8> = {
-        let mut m = HashMap::new();
-        for it in list_all().iter() {
-            m.insert(it.1, it.0);
-        }
-        m
-    };
-}
+static U8_TO_STR: Lazy<HashMap<u8, &'static str>> = Lazy::new(|| {
+    let mut m = HashMap::new();
+    for it in list_all().iter() {
+        m.insert(it.0, it.1);
+    }
+    m
+});
+
+static STR_TO_U8: Lazy<HashMap<&'static str, u8>> = Lazy::new(|| {
+    let mut m = HashMap::new();
+    for it in list_all().iter() {
+        m.insert(it.1, it.0);
+    }
+    m
+});
 
 impl MimeType {
     pub fn parse(value: u8) -> Option<MimeType> {

rsocket/src/lib.rs

@@ -95,21 +95,25 @@
 pub use async_stream::stream;
 /// A re-export of [`async-trait`](https://docs.rs/async-trait) for use with RSocket trait implementation.
 pub use async_trait::async_trait;
+use cfg_if::cfg_if;
 
 #[macro_use]
 extern crate anyhow;
 #[macro_use]
 extern crate log;
 #[macro_use]
-extern crate lazy_static;
+extern crate cfg_if;
 
 pub mod error;
 pub mod extension;
 
-#[cfg(feature = "frame")]
-pub mod frame;
-#[cfg(not(feature = "frame"))]
-mod frame;
+cfg_if! {
+    if #[cfg(feature = "frame")]{
+        pub mod frame;
+    }else{
+        mod frame;
+    }
+}
 
 mod core;
 mod payload;