Merge branch 'snapview:master' into into-inner

Author: hi-abhi

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.28.0
+
+- Update `tungstenite` to `0.18.0`. See [`tungstenite` release](https://github.com/snapview/tungstenite-rs/blob/master/CHANGELOG.md).
+
 # 0.27.0
 
 - See [performance updates in `tungstenite-rs`](https://github.com/snapview/tungstenite-rs/blob/master/CHANGELOG.md#0270).

Cargo.toml

@@ -6,9 +6,9 @@ keywords = ["websocket", "io", "web"]
 authors = ["Daniel Abramov <[email protected]>", "Alexey Galakhov <[email protected]>"]
 license = "MIT"
 homepage = "https://github.com/snapview/tokio-tungstenite"
-documentation = "https://docs.rs/tokio-tungstenite/0.27.0"
+documentation = "https://docs.rs/tokio-tungstenite/0.28.0"
 repository = "https://github.com/snapview/tokio-tungstenite"
-version = "0.27.0"
+version = "0.28.0"
 edition = "2018"
 rust-version = "1.63"
 include = ["examples/**/*", "src/**/*", "LICENSE", "README.md", "CHANGELOG.md"]

src/tls.rs

@@ -50,7 +50,7 @@ mod encryption {
                 Mode::Plain => Ok(MaybeTlsStream::Plain(socket)),
                 Mode::Tls => {
                     let try_connector = tls_connector.map_or_else(TlsConnector::new, Ok);
-                    let connector = try_connector.map_err(TlsError::Native)?;
+                    let connector = try_connector.map_err(TlsError::from)?;
                     let stream = TokioTlsConnector::from(connector);
                     let connected = stream.connect(&domain, socket).await;
                     match connected {