From 786329d85d06549aa1b15f9e4c5d8225c658f468 Mon Sep 17 00:00:00 2001
From: Yuri Astrakhan <yuriastrakhan@gmail.com>
Date: Tue, 19 Sep 2023 02:51:57 -0400
Subject: [PATCH] Use inline format args (#2232)
---
axum-core/src/macros.rs | 2 +-
axum-extra/src/body/async_read_body.rs | 2 +-
axum-extra/src/extract/form.rs | 2 +-
axum-extra/src/extract/query.rs | 2 +-
axum/src/docs/error_handling.md | 6 ++---
axum/src/docs/method_routing/fallback.md | 2 +-
axum/src/docs/routing/fallback.md | 2 +-
.../into_make_service_with_connect_info.md | 4 ++--
axum/src/handler/service.rs | 2 +-
axum/src/routing/method_routing.rs | 4 ++--
axum/src/routing/tests/mod.rs | 2 +-
examples/chat/src/main.rs | 10 ++++----
examples/customize-path-rejection/src/main.rs | 4 ++--
examples/diesel-async-postgres/src/main.rs | 2 +-
examples/diesel-postgres/src/main.rs | 2 +-
examples/graceful-shutdown/src/main.rs | 2 +-
examples/http-proxy/src/main.rs | 12 ++++------
examples/jwt/src/main.rs | 3 +--
examples/key-value-store/src/main.rs | 2 +-
examples/multipart-form/src/main.rs | 5 +---
examples/oauth/src/main.rs | 11 ++++-----
examples/print-request-response/src/main.rs | 4 ++--
.../src/main.rs | 4 ++--
examples/rest-grpc-multiplex/src/main.rs | 2 +-
examples/reverse-proxy/src/main.rs | 2 +-
examples/templates/src/main.rs | 2 +-
examples/testing/src/main.rs | 2 +-
examples/tls-graceful-shutdown/src/main.rs | 4 ++--
examples/tls-rustls/src/main.rs | 2 +-
examples/todos/src/main.rs | 2 +-
examples/unix-domain-socket/src/main.rs | 2 +-
examples/validator/src/main.rs | 2 +-
examples/versioning/src/main.rs | 2 +-
examples/websockets/src/client.rs | 18 +++++++-------
examples/websockets/src/main.rs | 24 +++++++++----------
35 files changed, 72 insertions(+), 83 deletions(-)
diff --git a/axum-core/src/macros.rs b/axum-core/src/macros.rs
index e0a4e868..1a573c21 100644
--- a/axum-core/src/macros.rs
+++ b/axum-core/src/macros.rs
@@ -193,7 +193,7 @@ macro_rules! __composite_rejection {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
$(
- Self::$variant(inner) => write!(f, "{}", inner),
+ Self::$variant(inner) => write!(f, "{inner}"),
)+
}
}
diff --git a/axum-extra/src/body/async_read_body.rs b/axum-extra/src/body/async_read_body.rs
index ce87e436..7cc06599 100644
--- a/axum-extra/src/body/async_read_body.rs
+++ b/axum-extra/src/body/async_read_body.rs
@@ -33,7 +33,7 @@ pin_project! {
/// let file = File::open("Cargo.toml")
/// .await
/// .map_err(|err| {
- /// (StatusCode::NOT_FOUND, format!("File not found: {}", err))
+ /// (StatusCode::NOT_FOUND, format!("File not found: {err}"))
/// })?;
///
/// let headers = [(CONTENT_TYPE, "text/x-toml")];
diff --git a/axum-extra/src/extract/form.rs b/axum-extra/src/extract/form.rs
index d7ee6f98..8729fb5a 100644
--- a/axum-extra/src/extract/form.rs
+++ b/axum-extra/src/extract/form.rs
@@ -83,7 +83,7 @@ impl IntoResponse for FormRejection {
Self::RawFormRejection(inner) => inner.into_response(),
Self::FailedToDeserializeForm(inner) => (
StatusCode::BAD_REQUEST,
- format!("Failed to deserialize form: {}", inner),
+ format!("Failed to deserialize form: {inner}"),
)
.into_response(),
}
diff --git a/axum-extra/src/extract/query.rs b/axum-extra/src/extract/query.rs
index 304d72b8..b4f5bebd 100644
--- a/axum-extra/src/extract/query.rs
+++ b/axum-extra/src/extract/query.rs
@@ -89,7 +89,7 @@ impl IntoResponse for QueryRejection {
match self {
Self::FailedToDeserializeQueryString(inner) => (
StatusCode::BAD_REQUEST,
- format!("Failed to deserialize query string: {}", inner),
+ format!("Failed to deserialize query string: {inner}"),
)
.into_response(),
}
diff --git a/axum/src/docs/error_handling.md b/axum/src/docs/error_handling.md
index cff30693..ea7d8a74 100644
--- a/axum/src/docs/error_handling.md
+++ b/axum/src/docs/error_handling.md
@@ -92,7 +92,7 @@ let app = Router::new().route_service(
async fn handle_anyhow_error(err: anyhow::Error) -> (StatusCode, String) {
(
StatusCode::INTERNAL_SERVER_ERROR,
- format!("Something went wrong: {}", err),
+ format!("Something went wrong: {err}"),
)
}
# let _: Router = app;
@@ -133,7 +133,7 @@ async fn handle_timeout_error(err: BoxError) -> (StatusCode, String) {
} else {
(
StatusCode::INTERNAL_SERVER_ERROR,
- format!("Unhandled internal error: {}", err),
+ format!("Unhandled internal error: {err}"),
)
}
}
@@ -174,7 +174,7 @@ async fn handle_timeout_error(
) -> (StatusCode, String) {
(
StatusCode::INTERNAL_SERVER_ERROR,
- format!("`{} {}` failed with {}", method, uri, err),
+ format!("`{method} {uri}` failed with {err}"),
)
}
# let _: Router = app;
diff --git a/axum/src/docs/method_routing/fallback.md b/axum/src/docs/method_routing/fallback.md
index 906cbb3b..90d11170 100644
--- a/axum/src/docs/method_routing/fallback.md
+++ b/axum/src/docs/method_routing/fallback.md
@@ -16,7 +16,7 @@ let handler = get(|| async {}).fallback(fallback);
let app = Router::new().route("/", handler);
async fn fallback(method: Method, uri: Uri) -> (StatusCode, String) {
- (StatusCode::NOT_FOUND, format!("`{}` not allowed for {}", method, uri))
+ (StatusCode::NOT_FOUND, format!("`{method}` not allowed for {uri}"))
}
# async {
# hyper::Server::bind(&"".parse().unwrap()).serve(app.into_make_service()).await.unwrap();
diff --git a/axum/src/docs/routing/fallback.md b/axum/src/docs/routing/fallback.md
index 582d0e2b..27fb76a5 100644
--- a/axum/src/docs/routing/fallback.md
+++ b/axum/src/docs/routing/fallback.md
@@ -16,7 +16,7 @@ let app = Router::new()
.fallback(fallback);
async fn fallback(uri: Uri) -> (StatusCode, String) {
- (StatusCode::NOT_FOUND, format!("No route for {}", uri))
+ (StatusCode::NOT_FOUND, format!("No route for {uri}"))
}
# let _: Router = app;
```
diff --git a/axum/src/docs/routing/into_make_service_with_connect_info.md b/axum/src/docs/routing/into_make_service_with_connect_info.md
index 67dd6524..26d0602f 100644
--- a/axum/src/docs/routing/into_make_service_with_connect_info.md
+++ b/axum/src/docs/routing/into_make_service_with_connect_info.md
@@ -17,7 +17,7 @@ use std::net::SocketAddr;
let app = Router::new().route("/", get(handler));
async fn handler(ConnectInfo(addr): ConnectInfo<SocketAddr>) -> String {
- format!("Hello {}", addr)
+ format!("Hello {addr}")
}
# async {
@@ -41,7 +41,7 @@ let app = Router::new().route("/", get(handler));
async fn handler(
ConnectInfo(my_connect_info): ConnectInfo<MyConnectInfo>,
) -> String {
- format!("Hello {:?}", my_connect_info)
+ format!("Hello {my_connect_info:?}")
}
#[derive(Clone, Debug)]
diff --git a/axum/src/handler/service.rs b/axum/src/handler/service.rs
index 35974a4c..50913e47 100644
--- a/axum/src/handler/service.rs
+++ b/axum/src/handler/service.rs
@@ -84,7 +84,7 @@ impl<H, T, S> HandlerService<H, T, S> {
/// ConnectInfo(addr): ConnectInfo<SocketAddr>,
/// State(state): State<AppState>,
/// ) -> String {
- /// format!("Hello {}", addr)
+ /// format!("Hello {addr}")
/// }
///
/// let app = handler.with_state(AppState {});
diff --git a/axum/src/routing/method_routing.rs b/axum/src/routing/method_routing.rs
index 0feb8db9..a0def5d1 100644
--- a/axum/src/routing/method_routing.rs
+++ b/axum/src/routing/method_routing.rs
@@ -619,7 +619,7 @@ impl MethodRouter<(), Infallible> {
/// use std::net::SocketAddr;
///
/// async fn handler(method: Method, uri: Uri, body: String) -> String {
- /// format!("received `{} {}` with body `{:?}`", method, uri, body)
+ /// format!("received `{method} {uri}` with body `{body:?}`")
/// }
///
/// let router = get(handler).post(handler);
@@ -650,7 +650,7 @@ impl MethodRouter<(), Infallible> {
/// use std::net::SocketAddr;
///
/// async fn handler(ConnectInfo(addr): ConnectInfo<SocketAddr>) -> String {
- /// format!("Hello {}", addr)
+ /// format!("Hello {addr}")
/// }
///
/// let router = get(handler).post(handler);
diff --git a/axum/src/routing/tests/mod.rs b/axum/src/routing/tests/mod.rs
index 1513cf69..f27ba0eb 100644
--- a/axum/src/routing/tests/mod.rs
+++ b/axum/src/routing/tests/mod.rs
@@ -945,7 +945,7 @@ async fn state_isnt_cloned_too_much() {
.filter(|line| line.contains("axum") || line.contains("./src"))
.collect::<Vec<_>>()
.join("\n");
- println!("AppState::Clone:\n===============\n{}\n", bt);
+ println!("AppState::Clone:\n===============\n{bt}\n");
COUNT.fetch_add(1, Ordering::SeqCst);
}
}
diff --git a/examples/chat/src/main.rs b/examples/chat/src/main.rs
index f7298c34..02e3bdc0 100644
--- a/examples/chat/src/main.rs
+++ b/examples/chat/src/main.rs
@@ -100,8 +100,8 @@ async fn websocket(stream: WebSocket, state: Arc<AppState>) {
let mut rx = state.tx.subscribe();
// Now send the "joined" message to all subscribers.
- let msg = format!("{} joined.", username);
- tracing::debug!("{}", msg);
+ let msg = format!("{username} joined.");
+ tracing::debug!("{msg}");
let _ = state.tx.send(msg);
// Spawn the first task that will receive broadcast messages and send text
@@ -124,7 +124,7 @@ async fn websocket(stream: WebSocket, state: Arc<AppState>) {
let mut recv_task = tokio::spawn(async move {
while let Some(Ok(Message::Text(text))) = receiver.next().await {
// Add username before message.
- let _ = tx.send(format!("{}: {}", name, text));
+ let _ = tx.send(format!("{name}: {text}"));
}
});
@@ -135,8 +135,8 @@ async fn websocket(stream: WebSocket, state: Arc<AppState>) {
};
// Send "user left" message (similar to "joined" above).
- let msg = format!("{} left.", username);
- tracing::debug!("{}", msg);
+ let msg = format!("{username} left.");
+ tracing::debug!("{msg}");
let _ = state.tx.send(msg);
// Remove username from map so new clients can take it again.
diff --git a/examples/customize-path-rejection/src/main.rs b/examples/customize-path-rejection/src/main.rs
index fa382e4b..4231eabf 100644
--- a/examples/customize-path-rejection/src/main.rs
+++ b/examples/customize-path-rejection/src/main.rs
@@ -109,7 +109,7 @@ where
},
_ => PathError {
- message: format!("Unhandled deserialization error: {}", kind),
+ message: format!("Unhandled deserialization error: {kind}"),
location: None,
},
};
@@ -126,7 +126,7 @@ where
_ => (
StatusCode::INTERNAL_SERVER_ERROR,
PathError {
- message: format!("Unhandled path rejection: {}", rejection),
+ message: format!("Unhandled path rejection: {rejection}"),
location: None,
},
),
diff --git a/examples/diesel-async-postgres/src/main.rs b/examples/diesel-async-postgres/src/main.rs
index 7403fe45..ee42ac10 100644
--- a/examples/diesel-async-postgres/src/main.rs
+++ b/examples/diesel-async-postgres/src/main.rs
@@ -76,7 +76,7 @@ async fn main() {
// run it with hyper
let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
- tracing::debug!("listening on {}", addr);
+ tracing::debug!("listening on {addr}");
let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
axum::serve(listener, app).await.unwrap();
}
diff --git a/examples/diesel-postgres/src/main.rs b/examples/diesel-postgres/src/main.rs
index de786474..605660d0 100644
--- a/examples/diesel-postgres/src/main.rs
+++ b/examples/diesel-postgres/src/main.rs
@@ -84,7 +84,7 @@ async fn main() {
// run it with hyper
let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
- tracing::debug!("listening on {}", addr);
+ tracing::debug!("listening on {addr}");
let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
axum::serve(listener, app).await.unwrap();
}
diff --git a/examples/graceful-shutdown/src/main.rs b/examples/graceful-shutdown/src/main.rs
index dabfee16..c50172fe 100644
--- a/examples/graceful-shutdown/src/main.rs
+++ b/examples/graceful-shutdown/src/main.rs
@@ -16,7 +16,7 @@ async fn main() {
// run it
let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
- println!("listening on {}", addr);
+ println!("listening on {addr}");
hyper::Server::bind(&addr)
.serve(app.into_make_service())
.with_graceful_shutdown(shutdown_signal())
diff --git a/examples/http-proxy/src/main.rs b/examples/http-proxy/src/main.rs
index 1abf3bbf..f0844f11 100644
--- a/examples/http-proxy/src/main.rs
+++ b/examples/http-proxy/src/main.rs
@@ -51,7 +51,7 @@ async fn main() {
});
let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
- tracing::debug!("listening on {}", addr);
+ tracing::debug!("listening on {addr}");
hyper::Server::bind(&addr)
.http1_preserve_header_case(true)
.http1_title_case_headers(true)
@@ -68,10 +68,10 @@ async fn proxy(req: Request) -> Result<Response, hyper::Error> {
match hyper::upgrade::on(req).await {
Ok(upgraded) => {
if let Err(e) = tunnel(upgraded, host_addr).await {
- tracing::warn!("server io error: {}", e);
+ tracing::warn!("server io error: {e}");
};
}
- Err(e) => tracing::warn!("upgrade error: {}", e),
+ Err(e) => tracing::warn!("upgrade error: {e}"),
}
});
@@ -92,11 +92,7 @@ async fn tunnel(mut upgraded: Upgraded, addr: String) -> std::io::Result<()> {
let (from_client, from_server) =
tokio::io::copy_bidirectional(&mut upgraded, &mut server).await?;
- tracing::debug!(
- "client wrote {} bytes and received {} bytes",
- from_client,
- from_server
- );
+ tracing::debug!("client wrote {from_client} bytes and received {from_server} bytes");
Ok(())
}
diff --git a/examples/jwt/src/main.rs b/examples/jwt/src/main.rs
index dda09d63..85211851 100644
--- a/examples/jwt/src/main.rs
+++ b/examples/jwt/src/main.rs
@@ -80,8 +80,7 @@ async fn main() {
async fn protected(claims: Claims) -> Result<String, AuthError> {
// Send the protected data to the user
Ok(format!(
- "Welcome to the protected area :)\nYour data:\n{}",
- claims
+ "Welcome to the protected area :)\nYour data:\n{claims}",
))
}
diff --git a/examples/key-value-store/src/main.rs b/examples/key-value-store/src/main.rs
index b22802cb..1e2a5e74 100644
--- a/examples/key-value-store/src/main.rs
+++ b/examples/key-value-store/src/main.rs
@@ -143,6 +143,6 @@ async fn handle_error(error: BoxError) -> impl IntoResponse {
(
StatusCode::INTERNAL_SERVER_ERROR,
- Cow::from(format!("Unhandled internal error: {}", error)),
+ Cow::from(format!("Unhandled internal error: {error}")),
)
}
diff --git a/examples/multipart-form/src/main.rs b/examples/multipart-form/src/main.rs
index f8c0d96b..ecf5191f 100644
--- a/examples/multipart-form/src/main.rs
+++ b/examples/multipart-form/src/main.rs
@@ -69,10 +69,7 @@ async fn accept_form(mut multipart: Multipart) {
let data = field.bytes().await.unwrap();
println!(
- "Length of `{}` (`{}`: `{}`) is {} bytes",
- name,
- file_name,
- content_type,
+ "Length of `{name}` (`{file_name}`: `{content_type}`) is {} bytes",
data.len()
);
}
diff --git a/examples/oauth/src/main.rs b/examples/oauth/src/main.rs
index dadfba8f..c133efaa 100644
--- a/examples/oauth/src/main.rs
+++ b/examples/oauth/src/main.rs
@@ -157,10 +157,7 @@ async fn discord_auth(State(client): State<BasicClient>) -> impl IntoResponse {
// Valid user session required. If there is none, redirect to the auth page
async fn protected(user: User) -> impl IntoResponse {
- format!(
- "Welcome to the protected area :)\nHere's your info:\n{:?}",
- user
- )
+ format!("Welcome to the protected area :)\nHere's your info:\n{user:?}")
}
async fn logout(
@@ -235,7 +232,7 @@ async fn login_authorized(
.context("unexpected error retrieving cookie value")?;
// Build the cookie
- let cookie = format!("{}={}; SameSite=Lax; Path=/", COOKIE_NAME, cookie);
+ let cookie = format!("{COOKIE_NAME}={cookie}; SameSite=Lax; Path=/");
// Set cookie
let mut headers = HeaderMap::new();
@@ -273,9 +270,9 @@ where
.map_err(|e| match *e.name() {
header::COOKIE => match e.reason() {
TypedHeaderRejectionReason::Missing => AuthRedirect,
- _ => panic!("unexpected error getting Cookie header(s): {}", e),
+ _ => panic!("unexpected error getting Cookie header(s): {e}"),
},
- _ => panic!("unexpected error getting cookies: {}", e),
+ _ => panic!("unexpected error getting cookies: {e}"),
})?;
let session_cookie = cookies.get(COOKIE_NAME).ok_or(AuthRedirect)?;
diff --git a/examples/print-request-response/src/main.rs b/examples/print-request-response/src/main.rs
index 1348d026..d6fde64a 100644
--- a/examples/print-request-response/src/main.rs
+++ b/examples/print-request-response/src/main.rs
@@ -63,13 +63,13 @@ where
Err(err) => {
return Err((
StatusCode::BAD_REQUEST,
- format!("failed to read {} body: {}", direction, err),
+ format!("failed to read {direction} body: {err}"),
));
}
};
if let Ok(body) = std::str::from_utf8(&bytes) {
- tracing::debug!("{} body = {:?}", direction, body);
+ tracing::debug!("{direction} body = {body:?}");
}
Ok(bytes)
diff --git a/examples/query-params-with-empty-strings/src/main.rs b/examples/query-params-with-empty-strings/src/main.rs
index 19117c4e..02d7df81 100644
--- a/examples/query-params-with-empty-strings/src/main.rs
+++ b/examples/query-params-with-empty-strings/src/main.rs
@@ -22,7 +22,7 @@ fn app() -> Router {
}
async fn handler(Query(params): Query<Params>) -> String {
- format!("{:?}", params)
+ format!("{params:?}")
}
/// See the tests below for which combinations of `foo` and `bar` result in
@@ -107,7 +107,7 @@ mod tests {
let body = app()
.oneshot(
Request::builder()
- .uri(format!("/?{}", query))
+ .uri(format!("/?{query}"))
.body(Body::empty())
.unwrap(),
)
diff --git a/examples/rest-grpc-multiplex/src/main.rs b/examples/rest-grpc-multiplex/src/main.rs
index b7f0ab02..14b061b6 100644
--- a/examples/rest-grpc-multiplex/src/main.rs
+++ b/examples/rest-grpc-multiplex/src/main.rs
@@ -74,7 +74,7 @@ async fn main() {
let service = MultiplexService::new(rest, grpc);
let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
- tracing::debug!("listening on {}", addr);
+ tracing::debug!("listening on {addr}");
hyper::Server::bind(&addr)
.serve(tower::make::Shared::new(service))
.await
diff --git a/examples/reverse-proxy/src/main.rs b/examples/reverse-proxy/src/main.rs
index 7ce7e83e..04112016 100644
--- a/examples/reverse-proxy/src/main.rs
+++ b/examples/reverse-proxy/src/main.rs
@@ -42,7 +42,7 @@ async fn handler(State(client): State<Client>, mut req: Request) -> Result<Respo
.map(|v| v.as_str())
.unwrap_or(path);
- let uri = format!("http://127.0.0.1:3000{}", path_query);
+ let uri = format!("http://127.0.0.1:3000{path_query}");
*req.uri_mut() = Uri::try_from(uri).unwrap();
diff --git a/examples/templates/src/main.rs b/examples/templates/src/main.rs
index 1abdb33e..3a6c8231 100644
--- a/examples/templates/src/main.rs
+++ b/examples/templates/src/main.rs
@@ -57,7 +57,7 @@ where
Ok(html) => Html(html).into_response(),
Err(err) => (
StatusCode::INTERNAL_SERVER_ERROR,
- format!("Failed to render template. Error: {}", err),
+ format!("Failed to render template. Error: {err}"),
)
.into_response(),
}
diff --git a/examples/testing/src/main.rs b/examples/testing/src/main.rs
index 5ca2a0ce..408225e9 100644
--- a/examples/testing/src/main.rs
+++ b/examples/testing/src/main.rs
@@ -140,7 +140,7 @@ mod tests {
let response = client
.request(
Request::builder()
- .uri(format!("http://{}", addr))
+ .uri(format!("http://{addr}"))
.body(hyper::Body::empty())
.unwrap(),
)
diff --git a/examples/tls-graceful-shutdown/src/main.rs b/examples/tls-graceful-shutdown/src/main.rs
index 301c6518..048eb70e 100644
--- a/examples/tls-graceful-shutdown/src/main.rs
+++ b/examples/tls-graceful-shutdown/src/main.rs
@@ -62,7 +62,7 @@ async fn main() {
// run https server
let addr = SocketAddr::from(([127, 0, 0, 1], ports.https));
- tracing::debug!("listening on {}", addr);
+ tracing::debug!("listening on {addr}");
axum_server::bind_rustls(addr, config)
.handle(handle)
.serve(app.into_make_service())
@@ -130,7 +130,7 @@ async fn redirect_http_to_https(ports: Ports, signal: impl Future<Output = ()>)
let addr = SocketAddr::from(([127, 0, 0, 1], ports.http));
//let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
- tracing::debug!("listening on {}", &addr);
+ tracing::debug!("listening on {addr}");
hyper::Server::bind(&addr)
.serve(redirect.into_make_service())
.with_graceful_shutdown(signal)
diff --git a/examples/tls-rustls/src/main.rs b/examples/tls-rustls/src/main.rs
index 860f56b5..3860427f 100644
--- a/examples/tls-rustls/src/main.rs
+++ b/examples/tls-rustls/src/main.rs
@@ -55,7 +55,7 @@ async fn main() {
// run https server
let addr = SocketAddr::from(([127, 0, 0, 1], ports.https));
- tracing::debug!("listening on {}", addr);
+ tracing::debug!("listening on {addr}");
axum_server::bind_rustls(addr, config)
.serve(app.into_make_service())
.await
diff --git a/examples/todos/src/main.rs b/examples/todos/src/main.rs
index 760bfdb9..2fdac41b 100644
--- a/examples/todos/src/main.rs
+++ b/examples/todos/src/main.rs
@@ -57,7 +57,7 @@ async fn main() {
} else {
Err((
StatusCode::INTERNAL_SERVER_ERROR,
- format!("Unhandled internal error: {}", error),
+ format!("Unhandled internal error: {error}"),
))
}
}))
diff --git a/examples/unix-domain-socket/src/main.rs b/examples/unix-domain-socket/src/main.rs
index ce350720..cb5625bb 100644
--- a/examples/unix-domain-socket/src/main.rs
+++ b/examples/unix-domain-socket/src/main.rs
@@ -94,7 +94,7 @@ mod unix {
}
async fn handler(ConnectInfo(info): ConnectInfo<UdsConnectInfo>) -> &'static str {
- println!("new connection from `{:?}`", info);
+ println!("new connection from `{info:?}`");
"Hello, World!"
}
diff --git a/examples/validator/src/main.rs b/examples/validator/src/main.rs
index a6a25b85..85c4ac18 100644
--- a/examples/validator/src/main.rs
+++ b/examples/validator/src/main.rs
@@ -85,7 +85,7 @@ impl IntoResponse for ServerError {
fn into_response(self) -> Response {
match self {
ServerError::ValidationError(_) => {
- let message = format!("Input validation error: [{}]", self).replace('\n', ", ");
+ let message = format!("Input validation error: [{self}]").replace('\n', ", ");
(StatusCode::BAD_REQUEST, message)
}
ServerError::AxumFormRejection(_) => (StatusCode::BAD_REQUEST, self.to_string()),
diff --git a/examples/versioning/src/main.rs b/examples/versioning/src/main.rs
index b5324d69..a1d96e83 100644
--- a/examples/versioning/src/main.rs
+++ b/examples/versioning/src/main.rs
@@ -37,7 +37,7 @@ async fn main() {
}
async fn handler(version: Version) {
- println!("received request with version {:?}", version);
+ println!("received request with version {version:?}");
}
#[derive(Debug)]
diff --git a/examples/websockets/src/client.rs b/examples/websockets/src/client.rs
index 971b573e..5d0a6706 100644
--- a/examples/websockets/src/client.rs
+++ b/examples/websockets/src/client.rs
@@ -49,10 +49,10 @@ async fn main() {
async fn spawn_client(who: usize) {
let ws_stream = match connect_async(SERVER).await {
Ok((stream, response)) => {
- println!("Handshake for client {} has been completed", who);
+ println!("Handshake for client {who} has been completed");
// This will be the HTTP response, same as with server this is the last moment we
// can still access HTTP stuff.
- println!("Server response was {:?}", response);
+ println!("Server response was {response:?}");
stream
}
Err(e) => {
@@ -74,7 +74,7 @@ async fn spawn_client(who: usize) {
for i in 1..30 {
// In any websocket error, break loop.
if sender
- .send(Message::Text(format!("Message number {}...", i)))
+ .send(Message::Text(format!("Message number {i}...")))
.await
.is_err()
{
@@ -86,7 +86,7 @@ async fn spawn_client(who: usize) {
}
// When we are done we may want our client to close connection cleanly.
- println!("Sending close to {}...", who);
+ println!("Sending close to {who}...");
if let Err(e) = sender
.send(Message::Close(Some(CloseFrame {
code: CloseCode::Normal,
@@ -94,7 +94,7 @@ async fn spawn_client(who: usize) {
})))
.await
{
- println!("Could not send Close due to {:?}, probably it is ok?", e);
+ println!("Could not send Close due to {e:?}, probably it is ok?");
};
});
@@ -124,7 +124,7 @@ async fn spawn_client(who: usize) {
fn process_message(msg: Message, who: usize) -> ControlFlow<(), ()> {
match msg {
Message::Text(t) => {
- println!(">>> {} got str: {:?}", who, t);
+ println!(">>> {who} got str: {t:?}");
}
Message::Binary(d) => {
println!(">>> {} got {} bytes: {:?}", who, d.len(), d);
@@ -136,19 +136,19 @@ fn process_message(msg: Message, who: usize) -> ControlFlow<(), ()> {
who, cf.code, cf.reason
);
} else {
- println!(">>> {} somehow got close message without CloseFrame", who);
+ println!(">>> {who} somehow got close message without CloseFrame");
}
return ControlFlow::Break(());
}
Message::Pong(v) => {
- println!(">>> {} got pong with {:?}", who, v);
+ println!(">>> {who} got pong with {v:?}");
}
// Just as with axum server, the underlying tungstenite websocket library
// will handle Ping for you automagically by replying with Pong and copying the
// v according to spec. But if you need the contents of the pings you can see them here.
Message::Ping(v) => {
- println!(">>> {} got ping with {:?}", who, v);
+ println!(">>> {who} got ping with {v:?}");
}
Message::Frame(_) => {
diff --git a/examples/websockets/src/main.rs b/examples/websockets/src/main.rs
index 1a7a9bd4..62b00d34 100644
--- a/examples/websockets/src/main.rs
+++ b/examples/websockets/src/main.rs
@@ -101,9 +101,9 @@ async fn ws_handler(
async fn handle_socket(mut socket: WebSocket, who: SocketAddr) {
//send a ping (unsupported by some browsers) just to kick things off and get a response
if socket.send(Message::Ping(vec![1, 2, 3])).await.is_ok() {
- println!("Pinged {}...", who);
+ println!("Pinged {who}...");
} else {
- println!("Could not send ping {}!", who);
+ println!("Could not send ping {who}!");
// no Error here since the only thing we can do is to close the connection.
// If we can not send messages, there is no way to salvage the statemachine anyway.
return;
@@ -168,7 +168,7 @@ async fn handle_socket(mut socket: WebSocket, who: SocketAddr) {
})))
.await
{
- println!("Could not send Close due to {}, probably it is ok?", e);
+ println!("Could not send Close due to {e}, probably it is ok?");
}
n_msg
});
@@ -190,29 +190,29 @@ async fn handle_socket(mut socket: WebSocket, who: SocketAddr) {
tokio::select! {
rv_a = (&mut send_task) => {
match rv_a {
- Ok(a) => println!("{} messages sent to {}", a, who),
- Err(a) => println!("Error sending messages {:?}", a)
+ Ok(a) => println!("{a} messages sent to {who}"),
+ Err(a) => println!("Error sending messages {a:?}")
}
recv_task.abort();
},
rv_b = (&mut recv_task) => {
match rv_b {
- Ok(b) => println!("Received {} messages", b),
- Err(b) => println!("Error receiving messages {:?}", b)
+ Ok(b) => println!("Received {b} messages"),
+ Err(b) => println!("Error receiving messages {b:?}")
}
send_task.abort();
}
}
// returning from the handler closes the websocket connection
- println!("Websocket context {} destroyed", who);
+ println!("Websocket context {who} destroyed");
}
/// helper to print contents of messages to stdout. Has special treatment for Close.
fn process_message(msg: Message, who: SocketAddr) -> ControlFlow<(), ()> {
match msg {
Message::Text(t) => {
- println!(">>> {} sent str: {:?}", who, t);
+ println!(">>> {who} sent str: {t:?}");
}
Message::Binary(d) => {
println!(">>> {} sent {} bytes: {:?}", who, d.len(), d);
@@ -224,19 +224,19 @@ fn process_message(msg: Message, who: SocketAddr) -> ControlFlow<(), ()> {
who, cf.code, cf.reason
);
} else {
- println!(">>> {} somehow sent close message without CloseFrame", who);
+ println!(">>> {who} somehow sent close message without CloseFrame");
}
return ControlFlow::Break(());
}
Message::Pong(v) => {
- println!(">>> {} sent pong with {:?}", who, v);
+ println!(">>> {who} sent pong with {v:?}");
}
// You should never need to manually handle Message::Ping, as axum's websocket library
// will do so for you automagically by replying with Pong and copying the v according to
// spec. But if you need the contents of the pings you can see them here.
Message::Ping(v) => {
- println!(">>> {} sent ping with {:?}", who, v);
+ println!(">>> {who} sent ping with {v:?}");
}
}
ControlFlow::Continue(())