Sync from master

.github/workflows/CI.yml

@@ -11,8 +11,8 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-env:
-  RUSTFLAGS: "-D warnings"
+permissions:
+  contents: read
 
 jobs:
 
@@ -69,6 +69,8 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
+    env:
+      RUSTFLAGS: "-D warnings"
     steps:
     - uses: actions/checkout@v4
     - uses: hecrj/setup-rust-action@v2
@@ -93,7 +95,7 @@ jobs:
         CARGO_RESOLVER_INCOMPATIBLE_RUST_VERSIONS: fallback
     - name: Get MSRV from manifest file
       id: msrv
-      run: echo "version=$(yq '.workspace.package.rust-version' Cargo.toml)" >> $GITHUB_OUTPUT
+      run: echo "version=$(yq '.workspace.package.rust-version' Cargo.toml)" >> "$GITHUB_OUTPUT"
     - uses: hecrj/setup-rust-action@v2
       with:
         rust-version: ${{ steps.msrv.outputs.version }}
@@ -154,18 +156,21 @@ jobs:
     - uses: obi1kenobi/cargo-semver-checks-action@v2
       with:
         feature-group: all-features
+        exclude: grpc
 
   external-types:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - uses: dtolnay/rust-toolchain@master
       with:
-        toolchain: nightly-2024-06-30
+        toolchain: nightly-2025-05-04
     - name: Install cargo-check-external-types
       uses: taiki-e/cache-cargo-install-action@v2
       with:
-        tool: cargo-check-external-types@0.1.13
+        tool: cargo-check-external-types@0.2.0
     - uses: taiki-e/install-action@cargo-hack
     - uses: Swatinem/rust-cache@v2
-    - run: cargo hack --no-private check-external-types
+    - run: cargo hack --no-private check-external-types --all-features
+      env:
+        RUSTFLAGS: "-D warnings"

Cargo.toml

@@ -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"

codegen/Cargo.toml

@@ -5,7 +5,7 @@ license = "MIT"
 edition = "2021"
 
 [dependencies]
-protox = "0.8"
+protox = "0.9"
 prettyplease = "0.2"
 quote = "1"
 syn = "2"

examples/Cargo.toml

@@ -279,7 +279,7 @@ default = ["full"]
 [dependencies]
 # Common dependencies
 tokio = { version = "1.0", features = ["rt-multi-thread", "macros"] }
-prost = "0.13"
+prost = "0.14"
 tonic = { path = "../tonic" }
 # Optional dependencies
 tonic-web = { path = "../tonic-web", optional = true }
@@ -295,9 +295,8 @@ serde = { version = "1.0", features = ["derive"], optional = true }
 serde_json = { version = "1.0", optional = true }
 tracing = { version = "0.1.16", optional = true }
 tracing-subscriber = { version = "0.3", features = ["tracing-log", "fmt"], optional = true }
-prost-types = { version = "0.13", optional = true }
+prost-types = { version = "0.14", optional = true }
 http = { version = "1", optional = true }
-http-body = { version = "1", optional = true }
 hyper = { version = "1", optional = true }
 hyper-util = { version = "0.1.4", optional = true }
 listenfd = { version = "1.0", optional = true }

examples/build.rs

@@ -2,7 +2,6 @@ use std::{env, path::PathBuf};
 
 fn main() {
     tonic_build::configure()
-        .type_attribute("routeguide.Point", "#[derive(Hash)]")
         .compile_protos(&["proto/routeguide/route_guide.proto"], &["proto"])
         .unwrap();
 

examples/helloworld-tutorial.md

@@ -113,7 +113,7 @@ path = "src/client.rs"
 
 [dependencies]
 tonic = "*"
-prost = "0.13"
+prost = "0.14"
 tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }
 
 [build-dependencies]

examples/routeguide-tutorial.md

@@ -175,7 +175,7 @@ Edit `Cargo.toml` and add all the dependencies we'll need for this example:
 ```toml
 [dependencies]
 tonic = "*"
-prost = "0.13"
+prost = "0.14"
 tokio = { version = "1.0", features = ["rt-multi-thread", "macros", "sync", "time"] }
 tokio-stream = "0.1"
 
@@ -335,27 +335,6 @@ the corresponding `data` module to load and deserialize it in
 **Note:** If you are following along, you'll need to change the data file's path  from
 `examples/data/route_guide_db.json` to `data/route_guide_db.json`.
 
-Next, we need to implement `Hash` and `Eq` for `Point`, so we can use point values as map keys:
-
-```rust
-use std::hash::{Hasher, Hash};
-```
-
-```rust
-impl Hash for Point {
-    fn hash<H>(&self, state: &mut H)
-    where
-        H: Hasher,
-    {
-        self.latitude.hash(state);
-        self.longitude.hash(state);
-    }
-}
-
-impl Eq for Point {}
-
-```
-
 Lastly, we need implement two helper functions: `in_range` and `calc_distance`. We'll use them
 when performing feature lookups. You can find them in
 [examples/src/routeguide/server.rs][in-range-fn].

examples/src/authentication/client.rs

@@ -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(())
 }

examples/src/autoreload/server.rs

@@ -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));
 

examples/src/blocking/client.rs

@@ -47,7 +47,7 @@ fn main() -> Result<()> {
 
     let response = client.say_hello(request)?;
 
-    println!("RESPONSE={:?}", response);
+    println!("RESPONSE={response:?}");
 
     Ok(())
 }

examples/src/cancellation/client.rs

@@ -24,7 +24,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         }
     };
 
-    println!("RESPONSE={:?}", response);
+    println!("RESPONSE={response:?}");
 
     Ok(())
 }

examples/src/cancellation/server.rs

@@ -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"))
@@ -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))

examples/src/codec_buffers/client.rs

@@ -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(())
 }

examples/src/codec_buffers/server.rs

@@ -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))

examples/src/compression/server.rs

@@ -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)

examples/src/dynamic/server.rs

@@ -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())

examples/src/dynamic_load_balance/client.rs

@@ -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);
     });
 
@@ -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");
         }

examples/src/dynamic_load_balance/server.rs

@@ -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();

examples/src/gcp/client.rs

@@ -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"]);
@@ -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(())
 }

examples/src/grpc-web/client.rs

@@ -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(())
 }

examples/src/grpc-web/server.rs

@@ -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.

examples/src/h2c/client.rs

@@ -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(())
 }

examples/src/h2c/server.rs

@@ -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();
@@ -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}");
             }
         }
     }

examples/src/health/server.rs

@@ -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)

examples/src/helloworld/client.rs

@@ -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(())
 }

examples/src/helloworld/server.rs

@@ -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))