Merge remote-tracking branch 'origin/master' into feat/multi-window-support

# Conflicts:
#	native/src/command/action.rs
#	native/src/window/action.rs
#	winit/src/window.rs

2 files changed, 2 insertions, 2 deletions

diff --git a/examples/websocket/src/echo.rs b/examples/websocket/src/echo.rs
index ae65e064..e74768a6 100644
--- a/examples/websocket/src/echo.rs
+++ b/examples/websocket/src/echo.rs
@@ -141,7 +141,7 @@ impl fmt::Display for Message {
             Message::Disconnected => {
                 write!(f, "Connection lost... Retrying...")
             }
-            Message::User(message) => write!(f, "{}", message),
+            Message::User(message) => write!(f, "{message}"),
         }
     }
 }
diff --git a/examples/websocket/src/echo/server.rs b/examples/websocket/src/echo/server.rs
index fef89a12..dd234984 100644
--- a/examples/websocket/src/echo/server.rs
+++ b/examples/websocket/src/echo/server.rs
@@ -41,7 +41,7 @@ async fn user_connected(ws: WebSocket) {
     tokio::task::spawn(async move {
         while let Some(message) = rx.next().await {
             user_ws_tx.send(message).await.unwrap_or_else(|e| {
-                eprintln!("websocket send error: {}", e);
+                eprintln!("websocket send error: {e}");
             });
         }
     });