diff --git a/aquatic_ws/src/lib/network/mod.rs b/aquatic_ws/src/lib/network/mod.rs index 81c9cda..a227b13 100644 --- a/aquatic_ws/src/lib/network/mod.rs +++ b/aquatic_ws/src/lib/network/mod.rs @@ -276,7 +276,7 @@ pub fn send_out_messages( use ::tungstenite::Error::Io; - let ws_message = out_message.into_ws_message(); + let ws_message = out_message.to_ws_message(); match established_ws.ws.write_message(ws_message){ Ok(()) => { diff --git a/aquatic_ws_protocol/src/lib.rs b/aquatic_ws_protocol/src/lib.rs index baddf67..96acb6b 100644 --- a/aquatic_ws_protocol/src/lib.rs +++ b/aquatic_ws_protocol/src/lib.rs @@ -257,6 +257,11 @@ pub enum InMessage { impl InMessage { + #[inline] + pub fn to_ws_message(&self) -> ::tungstenite::Message { + ::tungstenite::Message::from(::serde_json::to_string(&self).unwrap()) + } + #[inline] pub fn from_ws_message( ws_message: tungstenite::Message @@ -272,10 +277,6 @@ impl InMessage { return ::simd_json::serde::from_str(&mut text) .context("deserialize with serde"); } - - pub fn to_ws_message(&self) -> ::tungstenite::Message { - ::tungstenite::Message::from(::serde_json::to_string(&self).unwrap()) - } } @@ -291,7 +292,7 @@ pub enum OutMessage { impl OutMessage { #[inline] - pub fn into_ws_message(self) -> tungstenite::Message { + pub fn to_ws_message(&self) -> tungstenite::Message { ::tungstenite::Message::from(::serde_json::to_string(&self).unwrap()) } @@ -545,7 +546,7 @@ mod tests { #[quickcheck] fn quickcheck_serde_identity_out_message(out_message_1: OutMessage) -> bool { - let ws_message = out_message_1.clone().into_ws_message(); + let ws_message = out_message_1.to_ws_message(); let out_message_2 = OutMessage::from_ws_message( ws_message.clone()