Skip to content

chore: Use inline format argument #2260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,8 @@ missing_docs = "warn"
rust_2018_idioms = "warn"
unreachable_pub = "warn"

[workspace.lints.clippy]
uninlined_format_args = "deny"

[workspace.lints.rustdoc]
broken_intra_doc_links = "deny"
2 changes: 1 addition & 1 deletion examples/src/authentication/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {

let response = client.unary_echo(request).await?;

println!("RESPONSE={:?}", response);
println!("RESPONSE={response:?}");

Ok(())
}
2 changes: 1 addition & 1 deletion examples/src/autoreload/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let addr = "[::1]:50051".parse().unwrap();
let greeter = MyGreeter::default();

println!("GreeterServer listening on {}", addr);
println!("GreeterServer listening on {addr}");

let server = Server::builder().add_service(GreeterServer::new(greeter));

Expand Down
2 changes: 1 addition & 1 deletion examples/src/blocking/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ fn main() -> Result<()> {

let response = client.say_hello(request)?;

println!("RESPONSE={:?}", response);
println!("RESPONSE={response:?}");

Ok(())
}
2 changes: 1 addition & 1 deletion examples/src/cancellation/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
}
};

println!("RESPONSE={:?}", response);
println!("RESPONSE={response:?}");

Ok(())
}
4 changes: 2 additions & 2 deletions examples/src/cancellation/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ impl Greeter for MyGreeter {
Ok(Response::new(reply))
};
let cancellation_future = async move {
println!("Request from {:?} cancelled by client", remote_addr);
println!("Request from {remote_addr:?} cancelled by client");
// If this future is executed it means the request future was dropped,
// so it doesn't actually matter what is returned here
Err(Status::cancelled("Request cancelled by client"))
Expand Down Expand Up @@ -74,7 +74,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let addr = "[::1]:50051".parse().unwrap();
let greeter = MyGreeter::default();

println!("GreeterServer listening on {}", addr);
println!("GreeterServer listening on {addr}");

Server::builder()
.add_service(GreeterServer::new(greeter))
Expand Down
2 changes: 1 addition & 1 deletion examples/src/codec_buffers/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {

let response = client.say_hello(request).await?;

println!("RESPONSE={:?}", response);
println!("RESPONSE={response:?}");

Ok(())
}
2 changes: 1 addition & 1 deletion examples/src/codec_buffers/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let addr = "[::1]:50051".parse().unwrap();
let greeter = MyGreeter::default();

println!("GreeterServer listening on {}", addr);
println!("GreeterServer listening on {addr}");

Server::builder()
.add_service(GreeterServer::new(greeter))
Expand Down
2 changes: 1 addition & 1 deletion examples/src/compression/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let addr = "[::1]:50051".parse().unwrap();
let greeter = MyGreeter::default();

println!("GreeterServer listening on {}", addr);
println!("GreeterServer listening on {addr}");

let service = GreeterServer::new(greeter)
.send_compressed(CompressionEncoding::Gzip)
Expand Down
2 changes: 1 addition & 1 deletion examples/src/dynamic/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {

let addr = "[::1]:50051".parse().unwrap();

println!("Grpc server listening on {}", addr);
println!("Grpc server listening on {addr}");

Server::builder()
.add_routes(routes_builder.routes())
Expand Down
14 changes: 7 additions & 7 deletions examples/src/dynamic_load_balance/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,36 +27,36 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
println!("Added first endpoint");
let change = Change::Insert("1", e1);
let res = rx.send(change).await;
println!("{:?}", res);
println!("{res:?}");
tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
println!("Added second endpoint");
let change = Change::Insert("2", e2);
let res = rx.send(change).await;
println!("{:?}", res);
println!("{res:?}");
tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
println!("Removed first endpoint");
let change = Change::Remove("1");
let res = rx.send(change).await;
println!("{:?}", res);
println!("{res:?}");

tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
println!("Removed second endpoint");
let change = Change::Remove("2");
let res = rx.send(change).await;
println!("{:?}", res);
println!("{res:?}");

tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
println!("Added third endpoint");
let e3 = Endpoint::from_static("http://[::1]:50051");
let change = Change::Insert("3", e3);
let res = rx.send(change).await;
println!("{:?}", res);
println!("{res:?}");

tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
println!("Removed third endpoint");
let change = Change::Remove("3");
let res = rx.send(change).await;
println!("{:?}", res);
println!("{res:?}");
demo_done.swap(true, SeqCst);
});

Expand All @@ -68,7 +68,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {

let rx = client.unary_echo(request);
if let Ok(resp) = timeout(tokio::time::Duration::from_secs(10), rx).await {
println!("RESPONSE={:?}", resp);
println!("RESPONSE={resp:?}");
} else {
println!("did not receive value within 10 secs");
}
Expand Down
2 changes: 1 addition & 1 deletion examples/src/dynamic_load_balance/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {

tokio::spawn(async move {
if let Err(e) = serve.await {
eprintln!("Error = {:?}", e);
eprintln!("Error = {e:?}");
}

tx.send(()).unwrap();
Expand Down
6 changes: 3 additions & 3 deletions examples/src/gcp/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
.nth(1)
.ok_or_else(|| "Expected a project name as the first argument.".to_string())?;

let bearer_token = format!("Bearer {}", token);
let bearer_token = format!("Bearer {token}");
let header_value: MetadataValue<_> = bearer_token.parse()?;

let data_dir = std::path::PathBuf::from_iter([std::env!("CARGO_MANIFEST_DIR"), "data"]);
Expand All @@ -44,13 +44,13 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {

let response = service
.list_topics(Request::new(ListTopicsRequest {
project: format!("projects/{0}", project),
project: format!("projects/{project}"),
page_size: 10,
..Default::default()
}))
.await?;

println!("RESPONSE={:?}", response);
println!("RESPONSE={response:?}");

Ok(())
}
2 changes: 1 addition & 1 deletion examples/src/grpc-web/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {

let response = client.say_hello(request).await?;

println!("RESPONSE={:?}", response);
println!("RESPONSE={response:?}");

Ok(())
}
2 changes: 1 addition & 1 deletion examples/src/grpc-web/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
.into_inner()
.named_layer(GreeterServer::new(greeter));

println!("GreeterServer listening on {}", addr);
println!("GreeterServer listening on {addr}");

Server::builder()
// GrpcWeb is over http1 so we must enable it.
Expand Down
2 changes: 1 addition & 1 deletion examples/src/h2c/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {

let response = client.say_hello(request).await?;

println!("RESPONSE={:?}", response);
println!("RESPONSE={response:?}");

Ok(())
}
Expand Down
4 changes: 2 additions & 2 deletions examples/src/h2c/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let addr: SocketAddr = "[::1]:50051".parse().unwrap();
let greeter = MyGreeter::default();

println!("GreeterServer listening on {}", addr);
println!("GreeterServer listening on {addr}");

let incoming = TcpListener::bind(addr).await?;
let svc = Routes::new(GreeterServer::new(greeter)).prepare();
Expand All @@ -57,7 +57,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
});
}
Err(e) => {
eprintln!("Error accepting connection: {}", e);
eprintln!("Error accepting connection: {e}");
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion examples/src/health/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let addr = "[::1]:50051".parse().unwrap();
let greeter = MyGreeter::default();

println!("HealthServer + GreeterServer listening on {}", addr);
println!("HealthServer + GreeterServer listening on {addr}");

Server::builder()
.add_service(health_service)
Expand Down
2 changes: 1 addition & 1 deletion examples/src/helloworld/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {

let response = client.say_hello(request).await?;

println!("RESPONSE={:?}", response);
println!("RESPONSE={response:?}");

Ok(())
}
2 changes: 1 addition & 1 deletion examples/src/helloworld/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let addr = "[::1]:50051".parse().unwrap();
let greeter = MyGreeter::default();

println!("GreeterServer listening on {}", addr);
println!("GreeterServer listening on {addr}");

Server::builder()
.add_service(GreeterServer::new(greeter))
Expand Down
4 changes: 2 additions & 2 deletions examples/src/interceptor/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {

let response = client.say_hello(request).await?;

println!("RESPONSE={:?}", response);
println!("RESPONSE={response:?}");

Ok(())
}
Expand All @@ -34,7 +34,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
/// `Status` here will cancel the request and have that status returned to
/// the caller.
fn intercept(req: Request<()>) -> Result<Request<()>, Status> {
println!("Intercepting request: {:?}", req);
println!("Intercepting request: {req:?}");
Ok(req)
}

Expand Down
4 changes: 2 additions & 2 deletions examples/src/interceptor/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
// structs.
let svc = GreeterServer::with_interceptor(greeter, intercept);

println!("GreeterServer listening on {}", addr);
println!("GreeterServer listening on {addr}");

Server::builder().add_service(svc).serve(addr).await?;

Expand All @@ -47,7 +47,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
/// is returned, it will cancel the request and return that status to the
/// client.
fn intercept(mut req: Request<()>) -> Result<Request<()>, Status> {
println!("Intercepting request: {:?}", req);
println!("Intercepting request: {req:?}");

// Set an extension that can be retrieved by `say_hello`
req.extensions_mut().insert(MyExtension {
Expand Down
2 changes: 1 addition & 1 deletion examples/src/json-codec/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {

let response = client.say_hello(request).await?;

println!("RESPONSE={:?}", response);
println!("RESPONSE={response:?}");

Ok(())
}
2 changes: 1 addition & 1 deletion examples/src/json-codec/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let addr = "[::1]:50051".parse().unwrap();
let greeter = MyGreeter::default();

println!("GreeterServer listening on {}", addr);
println!("GreeterServer listening on {addr}");

Server::builder()
.add_service(GreeterServer::new(greeter))
Expand Down
2 changes: 1 addition & 1 deletion examples/src/load_balance/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {

let response = client.unary_echo(request).await?;

println!("RESPONSE={:?}", response);
println!("RESPONSE={response:?}");
}

Ok(())
Expand Down
2 changes: 1 addition & 1 deletion examples/src/load_balance/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {

tokio::spawn(async move {
if let Err(e) = serve.await {
eprintln!("Error = {:?}", e);
eprintln!("Error = {e:?}");
}

tx.send(()).unwrap();
Expand Down
2 changes: 1 addition & 1 deletion examples/src/mock/mock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {

let response = client.say_hello(request).await?;

println!("RESPONSE={:?}", response);
println!("RESPONSE={response:?}");

Ok(())
}
Expand Down
4 changes: 2 additions & 2 deletions examples/src/multiplex/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {

let response = greeter_client.say_hello(request).await?;

println!("GREETER RESPONSE={:?}", response);
println!("GREETER RESPONSE={response:?}");

let request = tonic::Request::new(EchoRequest {
message: "hello".into(),
});

let response = echo_client.unary_echo(request).await?;

println!("ECHO RESPONSE={:?}", response);
println!("ECHO RESPONSE={response:?}");

Ok(())
}
8 changes: 4 additions & 4 deletions examples/src/richer-error/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {

if let Some(bad_request) = err_details.bad_request() {
// Handle bad_request details
println!(" {:?}", bad_request);
println!(" {bad_request:?}");
}
if let Some(help) = err_details.help() {
// Handle help details
println!(" {:?}", help);
println!(" {help:?}");
}
if let Some(localized_message) = err_details.localized_message() {
// Handle localized_message details
println!(" {:?}", localized_message);
println!(" {localized_message:?}");
}

println!();
Expand All @@ -46,7 +46,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
}
};

println!(" Successful response received.\n\n {:?}\n", response);
println!(" Successful response received.\n\n {response:?}\n");

Ok(())
}
Loading
Loading