diff --git a/examples/autobahn-client.rs b/examples/autobahn-client.rs index 2de7c5d2..577d5e78 100644 --- a/examples/autobahn-client.rs +++ b/examples/autobahn-client.rs @@ -12,14 +12,14 @@ fn get_case_count() -> Result { } fn update_reports() -> Result<()> { - let (mut socket, _) = connect(&format!("ws://localhost:9001/updateReports?agent={}", AGENT))?; + let (mut socket, _) = connect(&format!("ws://localhost:9001/updateReports?agent={AGENT}"))?; socket.close(None)?; Ok(()) } fn run_test(case: u32) -> Result<()> { info!("Running test case {}", case); - let case_url = &format!("ws://localhost:9001/runCase?case={}&agent={}", case, AGENT); + let case_url = &format!("ws://localhost:9001/runCase?case={case}&agent={AGENT}"); let (mut socket, _) = connect(case_url)?; loop { match socket.read()? { diff --git a/examples/client.rs b/examples/client.rs index 3fb28db7..5eeba76b 100644 --- a/examples/client.rs +++ b/examples/client.rs @@ -9,13 +9,13 @@ fn main() { println!("Response HTTP code: {}", response.status()); println!("Response contains the following headers:"); for (ref header, _value) in response.headers() { - println!("* {}", header); + println!("* {header}"); } socket.send(Message::Text("Hello WebSocket".into())).unwrap(); loop { let msg = socket.read().expect("Error reading message"); - println!("Received: {}", msg); + println!("Received: {msg}"); } // socket.close(None); } diff --git a/examples/server.rs b/examples/server.rs index 2183b961..14100a6f 100644 --- a/examples/server.rs +++ b/examples/server.rs @@ -15,7 +15,7 @@ fn main() { println!("The request's path is: {}", req.uri().path()); println!("The request's headers are:"); for (ref header, _value) in req.headers() { - println!("* {}", header); + println!("* {header}"); } // Let's add an additional header to our response to the client. diff --git a/examples/srv_accept_unmasked_frames.rs b/examples/srv_accept_unmasked_frames.rs index b65e4f70..7c757218 100644 --- a/examples/srv_accept_unmasked_frames.rs +++ b/examples/srv_accept_unmasked_frames.rs @@ -15,7 +15,7 @@ fn main() { println!("The request's path is: {}", req.uri().path()); println!("The request's headers are:"); for (ref header, _value) in req.headers() { - println!("* {}", header); + println!("* {header}"); } // Let's add an additional header to our response to the client. @@ -40,7 +40,7 @@ fn main() { loop { let msg = websocket.read().unwrap(); if msg.is_binary() || msg.is_text() { - println!("received message {}", msg); + println!("received message {msg}"); } } }); diff --git a/src/handshake/client.rs b/src/handshake/client.rs index 51c244d4..ecc727cf 100644 --- a/src/handshake/client.rs +++ b/src/handshake/client.rs @@ -327,9 +327,9 @@ mod tests { #[test] fn random_keys() { let k1 = generate_key(); - println!("Generated random key 1: {}", k1); + println!("Generated random key 1: {k1}"); let k2 = generate_key(); - println!("Generated random key 2: {}", k2); + println!("Generated random key 2: {k2}"); assert_ne!(k1, k2); assert_eq!(k1.len(), k2.len()); assert_eq!(k1.len(), 24); @@ -349,9 +349,7 @@ mod tests { Upgrade: websocket\r\n\ Sec-WebSocket-Version: 13\r\n\ Sec-WebSocket-Key: {key}\r\n\ - \r\n", - host = host, - key = key + \r\n" ) .into_bytes() } diff --git a/src/handshake/mod.rs b/src/handshake/mod.rs index a8db9a98..765b1378 100644 --- a/src/handshake/mod.rs +++ b/src/handshake/mod.rs @@ -64,7 +64,7 @@ impl fmt::Debug for HandshakeError { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match *self { HandshakeError::Interrupted(_) => write!(f, "HandshakeError::Interrupted(...)"), - HandshakeError::Failure(ref e) => write!(f, "HandshakeError::Failure({:?})", e), + HandshakeError::Failure(ref e) => write!(f, "HandshakeError::Failure({e:?})"), } } } @@ -73,7 +73,7 @@ impl fmt::Display for HandshakeError { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match *self { HandshakeError::Interrupted(_) => write!(f, "Interrupted handshake (WouldBlock)"), - HandshakeError::Failure(ref e) => write!(f, "{}", e), + HandshakeError::Failure(ref e) => write!(f, "{e}"), } } } diff --git a/src/protocol/frame/coding.rs b/src/protocol/frame/coding.rs index 827b7cae..a1d56bb3 100644 --- a/src/protocol/frame/coding.rs +++ b/src/protocol/frame/coding.rs @@ -46,7 +46,7 @@ impl fmt::Display for Data { Data::Continue => write!(f, "CONTINUE"), Data::Text => write!(f, "TEXT"), Data::Binary => write!(f, "BINARY"), - Data::Reserved(x) => write!(f, "RESERVED_DATA_{}", x), + Data::Reserved(x) => write!(f, "RESERVED_DATA_{x}"), } } } @@ -57,7 +57,7 @@ impl fmt::Display for Control { Control::Close => write!(f, "CLOSE"), Control::Ping => write!(f, "PING"), Control::Pong => write!(f, "PONG"), - Control::Reserved(x) => write!(f, "RESERVED_CONTROL_{}", x), + Control::Reserved(x) => write!(f, "RESERVED_CONTROL_{x}"), } } } @@ -197,7 +197,7 @@ impl CloseCode { impl fmt::Display for CloseCode { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { let code: u16 = self.into(); - write!(f, "{}", code) + write!(f, "{code}") } } diff --git a/src/protocol/frame/frame.rs b/src/protocol/frame/frame.rs index 6b797a92..e53df95c 100644 --- a/src/protocol/frame/frame.rs +++ b/src/protocol/frame/frame.rs @@ -480,7 +480,7 @@ mod tests { #[test] fn display() { let f = Frame::message("hi there".into(), OpCode::Data(Data::Text), true); - let view = format!("{}", f); + let view = format!("{f}"); assert!(view.contains("payload:")); } } diff --git a/src/protocol/message.rs b/src/protocol/message.rs index 2b2ed0b1..9d408ba0 100644 --- a/src/protocol/message.rs +++ b/src/protocol/message.rs @@ -316,7 +316,7 @@ impl TryFrom for String { impl fmt::Display for Message { fn fmt(&self, f: &mut fmt::Formatter) -> StdResult<(), fmt::Error> { if let Ok(string) = self.to_text() { - write!(f, "{}", string) + write!(f, "{string}") } else { write!(f, "Binary Data", self.len()) }