From e6f8686155e5f5f3dba8cdcf9acc6c9d5c60375f Mon Sep 17 00:00:00 2001 From: Patrick Himmelmann Date: Fri, 6 Sep 2019 15:23:24 +0200 Subject: [PATCH] Change WebsocketContext to accept Bytes for ping This needed to change the tests: pong no longer takes a reference. This makes the interface more similar to "test" and "binary". --- actix-web-actors/src/ws.rs | 8 ++++---- actix-web-actors/tests/test_ws.rs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/actix-web-actors/src/ws.rs b/actix-web-actors/src/ws.rs index e25a7e6e4..b6b627962 100644 --- a/actix-web-actors/src/ws.rs +++ b/actix-web-actors/src/ws.rs @@ -345,14 +345,14 @@ where /// Send ping frame #[inline] - pub fn ping(&mut self, message: &str) { - self.write_raw(Message::Ping(message.to_string())); + pub fn ping>(&mut self, message: B) { + self.write_raw(Message::Ping(message.into())); } /// Send pong frame #[inline] - pub fn pong(&mut self, message: &str) { - self.write_raw(Message::Pong(message.to_string())); + pub fn pong>(&mut self, message: B) { + self.write_raw(Message::Pong(message.into())); } /// Send close frame diff --git a/actix-web-actors/tests/test_ws.rs b/actix-web-actors/tests/test_ws.rs index 687cf4314..49b69a1e9 100644 --- a/actix-web-actors/tests/test_ws.rs +++ b/actix-web-actors/tests/test_ws.rs @@ -15,7 +15,7 @@ impl Actor for Ws { impl StreamHandler for Ws { fn handle(&mut self, msg: ws::Message, ctx: &mut Self::Context) { match msg { - ws::Message::Ping(msg) => ctx.pong(&msg), + ws::Message::Ping(msg) => ctx.pong(msg), ws::Message::Text(text) => ctx.text(text), ws::Message::Binary(bin) => ctx.binary(bin), ws::Message::Close(reason) => ctx.close(reason),