From 4ed7cafc774675eb1ee941839c51b05bda602454 Mon Sep 17 00:00:00 2001 From: AsynchronousMatrix Date: Wed, 19 Jul 2023 12:44:44 +0100 Subject: [PATCH] rename 'stream_in' -> 'read_stream' & 'stream_out' -> 'write_stream' --- packages/lib/src/lua/net/websocket.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/lib/src/lua/net/websocket.rs b/packages/lib/src/lua/net/websocket.rs index 132e5ad..9380550 100644 --- a/packages/lib/src/lua/net/websocket.rs +++ b/packages/lib/src/lua/net/websocket.rs @@ -47,16 +47,16 @@ return freeze(setmetatable({ #[derive(Debug)] pub struct NetWebSocket { close_code: Arc>>, - stream_in: Arc>>>, - stream_out: Arc, WsMessage>>>, + read_stream: Arc>>>, + write_stream: Arc, WsMessage>>>, } impl Clone for NetWebSocket { fn clone(&self) -> Self { Self { close_code: Arc::clone(&self.close_code), - stream_in: Arc::clone(&self.stream_in), - stream_out: Arc::clone(&self.stream_out), + read_stream: Arc::clone(&self.read_stream), + write_stream: Arc::clone(&self.write_stream), } } } @@ -70,8 +70,8 @@ where Self { close_code: Arc::new(Cell::new(None)), - stream_in: Arc::new(AsyncMutex::new(read)), - stream_out: Arc::new(AsyncMutex::new(write)), + read_stream: Arc::new(AsyncMutex::new(read)), + write_stream: Arc::new(AsyncMutex::new(write)), } } @@ -152,7 +152,7 @@ async fn close<'lua, T>( where T: AsyncRead + AsyncWrite + Unpin, { - let mut ws = socket.stream_out.lock().await; + let mut ws = socket.write_stream.lock().await; let _ = ws .send(WsMessage::Close(Some(WsCloseFrame { @@ -190,7 +190,7 @@ where let s = string.to_str().map_err(LuaError::external)?; WsMessage::Text(s.to_string()) }; - let mut ws = socket.stream_out.lock().await; + let mut ws = socket.write_stream.lock().await; ws.send(msg).await.map_err(LuaError::external) } @@ -201,7 +201,7 @@ async fn next<'lua, T>( where T: AsyncRead + AsyncWrite + Unpin, { - let mut ws = socket.stream_in.lock().await; + let mut ws = socket.read_stream.lock().await; let item = ws.next().await.transpose().map_err(LuaError::external); let msg = match item { Ok(Some(WsMessage::Close(msg))) => {