From 83ff4f38e1d0444c02c3e59874cb0cd74b3823cc Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Mon, 4 Jan 2021 01:27:41 +0000
Subject: [PATCH] fix tests

---
 actix-http/tests/test_ws.rs       | 2 +-
 actix-web-actors/tests/test_ws.rs | 2 +-
 awc/src/lib.rs                    | 2 +-
 awc/src/ws.rs                     | 2 +-
 awc/tests/test_ws.rs              | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/actix-http/tests/test_ws.rs b/actix-http/tests/test_ws.rs
index ae35b9701..dca9d49b2 100644
--- a/actix-http/tests/test_ws.rs
+++ b/actix-http/tests/test_ws.rs
@@ -74,7 +74,7 @@ async fn service(msg: ws::Frame) -> Result<ws::Message, Error> {
     let msg = match msg {
         ws::Frame::Ping(msg) => ws::Message::Pong(msg),
         ws::Frame::Text(text) => {
-            ws::Message::Text(String::from_utf8_lossy(&text).to_owned().into())
+            ws::Message::Text(String::from_utf8_lossy(&text).into_owned().into())
         }
         ws::Frame::Binary(bin) => ws::Message::Binary(bin),
         ws::Frame::Continuation(item) => ws::Message::Continuation(item),
diff --git a/actix-web-actors/tests/test_ws.rs b/actix-web-actors/tests/test_ws.rs
index a5233e5e0..4181cea76 100644
--- a/actix-web-actors/tests/test_ws.rs
+++ b/actix-web-actors/tests/test_ws.rs
@@ -39,7 +39,7 @@ async fn test_simple() {
     // client service
     let mut framed = srv.ws().await.unwrap();
     framed
-        .send(ws::Message::Text("text".to_string()))
+        .send(ws::Message::Text("text".into()))
         .await
         .unwrap();
 
diff --git a/awc/src/lib.rs b/awc/src/lib.rs
index fb6ed086a..d9db7a2cf 100644
--- a/awc/src/lib.rs
+++ b/awc/src/lib.rs
@@ -76,7 +76,7 @@
 //!     .await?;
 //!
 //! connection
-//!     .send(awc::ws::Message::Text("Echo".to_string()))
+//!     .send(awc::ws::Message::Text("Echo".into()))
 //!     .await?;
 //! let response = connection.next().await.unwrap()?;
 //! # assert_eq!(response, awc::ws::Frame::Text("Echo".as_bytes().into()));
diff --git a/awc/src/ws.rs b/awc/src/ws.rs
index a1fa07d8d..b90d0942b 100644
--- a/awc/src/ws.rs
+++ b/awc/src/ws.rs
@@ -17,7 +17,7 @@
 //!         .unwrap();
 //!
 //!     connection
-//!         .send(ws::Message::Text("Echo".to_string()))
+//!         .send(ws::Message::Text("Echo".into()))
 //!         .await
 //!         .unwrap();
 //!     let response = connection.next().await.unwrap().unwrap();
diff --git a/awc/tests/test_ws.rs b/awc/tests/test_ws.rs
index 1c1068668..760b791ee 100644
--- a/awc/tests/test_ws.rs
+++ b/awc/tests/test_ws.rs
@@ -11,7 +11,7 @@ async fn ws_service(req: ws::Frame) -> Result<ws::Message, io::Error> {
     match req {
         ws::Frame::Ping(msg) => Ok(ws::Message::Pong(msg)),
         ws::Frame::Text(text) => Ok(ws::Message::Text(
-            String::from_utf8(Vec::from(text.as_ref())).unwrap(),
+            String::from_utf8(Vec::from(text.as_ref())).unwrap().into(),
         )),
         ws::Frame::Binary(bin) => Ok(ws::Message::Binary(bin)),
         ws::Frame::Close(reason) => Ok(ws::Message::Close(reason)),
@@ -44,7 +44,7 @@ async fn test_simple() {
     // client service
     let mut framed = srv.ws().await.unwrap();
     framed
-        .send(ws::Message::Text("text".to_string()))
+        .send(ws::Message::Text("text".into()))
         .await
         .unwrap();
     let item = framed.next().await.unwrap().unwrap();