YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-02 02:35:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

aquatic_ws: InMessage::to_ws_message: don't take ownership

Browse source
This commit is contained in:
Joakim Frostegård 2020-08-11 23:24:46 +02:00
parent 63e5fe11c9
commit de1a299f1e
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aquatic_ws/src/lib/network/mod.rs
View file

@ -276,7 +276,7 @@ pub fn send_out_messages(
use ::tungstenite::Error::Io; 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){ match established_ws.ws.write_message(ws_message){
Ok(()) => { Ok(()) => {

13
aquatic_ws_protocol/src/lib.rs
View file

@ -257,6 +257,11 @@ pub enum InMessage {
impl InMessage { impl InMessage {
#[inline]
pub fn to_ws_message(&self) -> ::tungstenite::Message {
::tungstenite::Message::from(::serde_json::to_string(&self).unwrap())
}
#[inline] #[inline]
pub fn from_ws_message( pub fn from_ws_message(
ws_message: tungstenite::Message ws_message: tungstenite::Message
@ -272,10 +277,6 @@ impl InMessage {
return ::simd_json::serde::from_str(&mut text) return ::simd_json::serde::from_str(&mut text)
.context("deserialize with serde"); .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 { impl OutMessage {
#[inline] #[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()) ::tungstenite::Message::from(::serde_json::to_string(&self).unwrap())
} }
@ -545,7 +546,7 @@ mod tests {
#[quickcheck] #[quickcheck]
fn quickcheck_serde_identity_out_message(out_message_1: OutMessage) -> bool { 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( let out_message_2 = OutMessage::from_ws_message(
ws_message.clone() ws_message.clone()