Skip to content

Commit 97001f3

Browse files
authored
chore: Use inline format argument (#2260)
1 parent cb6c67f commit 97001f3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+189
-208
lines changed

Cargo.toml

+3
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,8 @@ missing_docs = "warn"
4141
rust_2018_idioms = "warn"
4242
unreachable_pub = "warn"
4343

44+
[workspace.lints.clippy]
45+
uninlined_format_args = "deny"
46+
4447
[workspace.lints.rustdoc]
4548
broken_intra_doc_links = "deny"

examples/src/authentication/client.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
2222

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

25-
println!("RESPONSE={:?}", response);
25+
println!("RESPONSE={response:?}");
2626

2727
Ok(())
2828
}

examples/src/autoreload/server.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
3030
let addr = "[::1]:50051".parse().unwrap();
3131
let greeter = MyGreeter::default();
3232

33-
println!("GreeterServer listening on {}", addr);
33+
println!("GreeterServer listening on {addr}");
3434

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

examples/src/blocking/client.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ fn main() -> Result<()> {
4747

4848
let response = client.say_hello(request)?;
4949

50-
println!("RESPONSE={:?}", response);
50+
println!("RESPONSE={response:?}");
5151

5252
Ok(())
5353
}

examples/src/cancellation/client.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
2424
}
2525
};
2626

27-
println!("RESPONSE={:?}", response);
27+
println!("RESPONSE={response:?}");
2828

2929
Ok(())
3030
}

examples/src/cancellation/server.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ impl Greeter for MyGreeter {
3737
Ok(Response::new(reply))
3838
};
3939
let cancellation_future = async move {
40-
println!("Request from {:?} cancelled by client", remote_addr);
40+
println!("Request from {remote_addr:?} cancelled by client");
4141
// If this future is executed it means the request future was dropped,
4242
// so it doesn't actually matter what is returned here
4343
Err(Status::cancelled("Request cancelled by client"))
@@ -74,7 +74,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
7474
let addr = "[::1]:50051".parse().unwrap();
7575
let greeter = MyGreeter::default();
7676

77-
println!("GreeterServer listening on {}", addr);
77+
println!("GreeterServer listening on {addr}");
7878

7979
Server::builder()
8080
.add_service(GreeterServer::new(greeter))

examples/src/codec_buffers/client.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
2424

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

27-
println!("RESPONSE={:?}", response);
27+
println!("RESPONSE={response:?}");
2828

2929
Ok(())
3030
}

examples/src/codec_buffers/server.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
4040
let addr = "[::1]:50051".parse().unwrap();
4141
let greeter = MyGreeter::default();
4242

43-
println!("GreeterServer listening on {}", addr);
43+
println!("GreeterServer listening on {addr}");
4444

4545
Server::builder()
4646
.add_service(GreeterServer::new(greeter))

examples/src/compression/server.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
3131
let addr = "[::1]:50051".parse().unwrap();
3232
let greeter = MyGreeter::default();
3333

34-
println!("GreeterServer listening on {}", addr);
34+
println!("GreeterServer listening on {addr}");
3535

3636
let service = GreeterServer::new(greeter)
3737
.send_compressed(CompressionEncoding::Gzip)

examples/src/dynamic/server.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
7777

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

80-
println!("Grpc server listening on {}", addr);
80+
println!("Grpc server listening on {addr}");
8181

8282
Server::builder()
8383
.add_routes(routes_builder.routes())

examples/src/dynamic_load_balance/client.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -27,36 +27,36 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
2727
println!("Added first endpoint");
2828
let change = Change::Insert("1", e1);
2929
let res = rx.send(change).await;
30-
println!("{:?}", res);
30+
println!("{res:?}");
3131
tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
3232
println!("Added second endpoint");
3333
let change = Change::Insert("2", e2);
3434
let res = rx.send(change).await;
35-
println!("{:?}", res);
35+
println!("{res:?}");
3636
tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
3737
println!("Removed first endpoint");
3838
let change = Change::Remove("1");
3939
let res = rx.send(change).await;
40-
println!("{:?}", res);
40+
println!("{res:?}");
4141

4242
tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
4343
println!("Removed second endpoint");
4444
let change = Change::Remove("2");
4545
let res = rx.send(change).await;
46-
println!("{:?}", res);
46+
println!("{res:?}");
4747

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

5555
tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
5656
println!("Removed third endpoint");
5757
let change = Change::Remove("3");
5858
let res = rx.send(change).await;
59-
println!("{:?}", res);
59+
println!("{res:?}");
6060
demo_done.swap(true, SeqCst);
6161
});
6262

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

6969
let rx = client.unary_echo(request);
7070
if let Ok(resp) = timeout(tokio::time::Duration::from_secs(10), rx).await {
71-
println!("RESPONSE={:?}", resp);
71+
println!("RESPONSE={resp:?}");
7272
} else {
7373
println!("did not receive value within 10 secs");
7474
}

examples/src/dynamic_load_balance/server.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
4141

4242
tokio::spawn(async move {
4343
if let Err(e) = serve.await {
44-
eprintln!("Error = {:?}", e);
44+
eprintln!("Error = {e:?}");
4545
}
4646

4747
tx.send(()).unwrap();

examples/src/gcp/client.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
2121
.nth(1)
2222
.ok_or_else(|| "Expected a project name as the first argument.".to_string())?;
2323

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

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

4545
let response = service
4646
.list_topics(Request::new(ListTopicsRequest {
47-
project: format!("projects/{0}", project),
47+
project: format!("projects/{project}"),
4848
page_size: 10,
4949
..Default::default()
5050
}))
5151
.await?;
5252

53-
println!("RESPONSE={:?}", response);
53+
println!("RESPONSE={response:?}");
5454

5555
Ok(())
5656
}

examples/src/grpc-web/client.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
2323

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

26-
println!("RESPONSE={:?}", response);
26+
println!("RESPONSE={response:?}");
2727

2828
Ok(())
2929
}

examples/src/grpc-web/server.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
3838
.into_inner()
3939
.named_layer(GreeterServer::new(greeter));
4040

41-
println!("GreeterServer listening on {}", addr);
41+
println!("GreeterServer listening on {addr}");
4242

4343
Server::builder()
4444
// GrpcWeb is over http1 so we must enable it.

examples/src/h2c/client.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
2323

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

26-
println!("RESPONSE={:?}", response);
26+
println!("RESPONSE={response:?}");
2727

2828
Ok(())
2929
}

examples/src/h2c/server.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
3636
let addr: SocketAddr = "[::1]:50051".parse().unwrap();
3737
let greeter = MyGreeter::default();
3838

39-
println!("GreeterServer listening on {}", addr);
39+
println!("GreeterServer listening on {addr}");
4040

4141
let incoming = TcpListener::bind(addr).await?;
4242
let svc = Routes::new(GreeterServer::new(greeter)).prepare();
@@ -57,7 +57,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
5757
});
5858
}
5959
Err(e) => {
60-
eprintln!("Error accepting connection: {}", e);
60+
eprintln!("Error accepting connection: {e}");
6161
}
6262
}
6363
}

examples/src/health/server.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
5555
let addr = "[::1]:50051".parse().unwrap();
5656
let greeter = MyGreeter::default();
5757

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

6060
Server::builder()
6161
.add_service(health_service)

examples/src/helloworld/client.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
1515

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

18-
println!("RESPONSE={:?}", response);
18+
println!("RESPONSE={response:?}");
1919

2020
Ok(())
2121
}

examples/src/helloworld/server.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
3030
let addr = "[::1]:50051".parse().unwrap();
3131
let greeter = MyGreeter::default();
3232

33-
println!("GreeterServer listening on {}", addr);
33+
println!("GreeterServer listening on {addr}");
3434

3535
Server::builder()
3636
.add_service(GreeterServer::new(greeter))

examples/src/interceptor/client.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
2525

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

28-
println!("RESPONSE={:?}", response);
28+
println!("RESPONSE={response:?}");
2929

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

examples/src/interceptor/server.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
3636
// structs.
3737
let svc = GreeterServer::with_interceptor(greeter, intercept);
3838

39-
println!("GreeterServer listening on {}", addr);
39+
println!("GreeterServer listening on {addr}");
4040

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

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

5252
// Set an extension that can be retrieved by `say_hello`
5353
req.extensions_mut().insert(MyExtension {

examples/src/json-codec/client.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
2222

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

25-
println!("RESPONSE={:?}", response);
25+
println!("RESPONSE={response:?}");
2626

2727
Ok(())
2828
}

examples/src/json-codec/server.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
3737
let addr = "[::1]:50051".parse().unwrap();
3838
let greeter = MyGreeter::default();
3939

40-
println!("GreeterServer listening on {}", addr);
40+
println!("GreeterServer listening on {addr}");
4141

4242
Server::builder()
4343
.add_service(GreeterServer::new(greeter))

examples/src/load_balance/client.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
2222

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

25-
println!("RESPONSE={:?}", response);
25+
println!("RESPONSE={response:?}");
2626
}
2727

2828
Ok(())

examples/src/load_balance/server.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
4141

4242
tokio::spawn(async move {
4343
if let Err(e) = serve.await {
44-
eprintln!("Error = {:?}", e);
44+
eprintln!("Error = {e:?}");
4545
}
4646

4747
tx.send(()).unwrap();

examples/src/mock/mock.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
5353

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

56-
println!("RESPONSE={:?}", response);
56+
println!("RESPONSE={response:?}");
5757

5858
Ok(())
5959
}

examples/src/multiplex/client.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
2525

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

28-
println!("GREETER RESPONSE={:?}", response);
28+
println!("GREETER RESPONSE={response:?}");
2929

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

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

36-
println!("ECHO RESPONSE={:?}", response);
36+
println!("ECHO RESPONSE={response:?}");
3737

3838
Ok(())
3939
}

examples/src/richer-error/client.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
2929

3030
if let Some(bad_request) = err_details.bad_request() {
3131
// Handle bad_request details
32-
println!(" {:?}", bad_request);
32+
println!(" {bad_request:?}");
3333
}
3434
if let Some(help) = err_details.help() {
3535
// Handle help details
36-
println!(" {:?}", help);
36+
println!(" {help:?}");
3737
}
3838
if let Some(localized_message) = err_details.localized_message() {
3939
// Handle localized_message details
40-
println!(" {:?}", localized_message);
40+
println!(" {localized_message:?}");
4141
}
4242

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

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

5151
Ok(())
5252
}

0 commit comments

Comments
 (0)