Make conversion from native message to Message private

Signed-off-by: Yuki Kishimoto <yukikishimoto@protonmail.com>

Author: yukibtc

src/message.rs

@@ -42,6 +42,20 @@ pub enum Message {
 }
 
 impl Message {
+    #[cfg(not(target_arch = "wasm32"))]
+    pub(crate) fn from_native(msg: TungsteniteMessage) -> Self {
+        match msg {
+            TungsteniteMessage::Text(text) => Self::Text(text.to_string()),
+            TungsteniteMessage::Binary(data) => Self::Binary(data.to_vec()),
+            TungsteniteMessage::Ping(data) => Self::Ping(data.to_vec()),
+            TungsteniteMessage::Pong(data) => Self::Pong(data.to_vec()),
+            TungsteniteMessage::Close(frame) => Self::Close(frame.map(|f| f.into())),
+            // SAFETY: from tungstenite docs: "you're not going to get this value while reading the message".
+            // SAFETY: this conversion is used only in Stream trait, so when reading the messages.
+            TungsteniteMessage::Frame(..) => unreachable!(),
+        }
+    }
+
     /// Get the length of the WebSocket message.
     #[inline]
     pub fn len(&self) -> usize {
@@ -120,19 +134,3 @@ impl From<TungsteniteCloseFrame> for CloseFrame {
         }
     }
 }
-
-#[cfg(not(target_arch = "wasm32"))]
-impl From<TungsteniteMessage> for Message {
-    fn from(msg: TungsteniteMessage) -> Self {
-        match msg {
-            TungsteniteMessage::Text(text) => Self::Text(text.to_string()),
-            TungsteniteMessage::Binary(data) => Self::Binary(data.to_vec()),
-            TungsteniteMessage::Ping(data) => Self::Ping(data.to_vec()),
-            TungsteniteMessage::Pong(data) => Self::Pong(data.to_vec()),
-            TungsteniteMessage::Close(frame) => Self::Close(frame.map(|f| f.into())),
-            // SAFETY: from tungstenite docs: "you're not going to get this value while reading the message".
-            // SAFETY: this conversion is used only in Stream trait, so when reading the messages.
-            TungsteniteMessage::Frame(..) => unreachable!(),
-        }
-    }
-}

src/socket.rs

@@ -85,12 +85,12 @@ impl Stream for WebSocket {
             #[cfg(not(target_arch = "wasm32"))]
             Self::Tokio(s) => Pin::new(s)
                 .poll_next(cx)
-                .map(|i| i.map(|res| res.map(|msg| msg.into())))
+                .map(|i| i.map(|res| res.map(Message::from_native)))
                 .map_err(Into::into),
             #[cfg(all(feature = "tor", not(target_arch = "wasm32")))]
             Self::Tor(s) => Pin::new(s)
                 .poll_next(cx)
-                .map(|i| i.map(|res| res.map(|msg| msg.into())))
+                .map(|i| i.map(|res| res.map(Message::from_native)))
                 .map_err(Into::into),
             #[cfg(target_arch = "wasm32")]
             Self::Wasm(s) => Pin::new(s).poll_next(cx).map_err(Into::into),