Merge master -> next

.github/workflows/CI.yml

@@ -7,6 +7,10 @@ on:
   merge_group:
     branches: [ "master" ]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   RUSTFLAGS: "-D warnings"
 
@@ -21,14 +25,6 @@ jobs:
         components: rustfmt
     - run: cargo fmt --all --check
 
-  deny:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: hecrj/setup-rust-action@v2
-    - uses: taiki-e/install-action@cargo-deny
-    - run: cargo deny check
-
   clippy:
     runs-on: ubuntu-latest
     steps:
@@ -55,7 +51,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: dtolnay/rust-toolchain@master
       with:
-        toolchain: nightly-2024-12-01
+        toolchain: nightly-2025-03-27
     - uses: taiki-e/install-action@cargo-hack
     - uses: taiki-e/install-action@cargo-udeps
     - uses: taiki-e/install-action@protoc
@@ -97,7 +93,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 }}

CHANGELOG.md

@@ -1,3 +1,5 @@
+# NOTE: ths changelog is no longer used and from version `v0.13.0` onward we will be using github releases and the changes can be found [here](https://github.com/hyperium/tonic/releases).
+
 # [0.12.3](https://github.com/hyperium/tonic/compare/v0.12.2...v0.12.3) (2024-08-29)
 
 ### Features

Cargo.toml

@@ -8,6 +8,7 @@ members = [
   "tonic-web", # Non-published crates
   "examples",
   "codegen",
+  "grpc",
   "interop", # Tests
   "tests/disable_comments",
   "tests/included_service",
@@ -40,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"

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2020 Lucio Franco
+Copyright (c) 2025 Lucio Franco
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

codegen/Cargo.toml

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

codegen/src/main.rs

@@ -113,7 +113,22 @@ fn codegen(
 fn write_fds(fds: &FileDescriptorSet, path: &Path) {
     const GENERATED_COMMENT: &str = "// This file is @generated by codegen.";
 
+    let mut file_header = String::new();
+
     let mut fds = fds.clone();
+
+    for fd in fds.file.iter() {
+        let Some(source_code_info) = &fd.source_code_info else {
+            continue;
+        };
+
+        for location in &source_code_info.location {
+            for comment in &location.leading_detached_comments {
+                file_header += comment;
+            }
+        }
+    }
+
     for fd in fds.file.iter_mut() {
         fd.source_code_info = None;
     }
@@ -126,8 +141,23 @@ fn write_fds(fds: &FileDescriptorSet, path: &Path) {
     let ast = syn::parse2(tokens).unwrap();
     let formatted = prettyplease::unparse(&ast);
 
-    let content = format!("{GENERATED_COMMENT}\n{formatted}");
-
     let mut writer = BufWriter::new(File::create(path).unwrap());
-    writer.write_all(content.as_bytes()).unwrap();
+
+    writer.write_all(GENERATED_COMMENT.as_bytes()).unwrap();
+    writer.write_all(b"\n").unwrap();
+
+    if !file_header.is_empty() {
+        let file_header = comment_out(&file_header);
+        writer.write_all(file_header.as_bytes()).unwrap();
+        writer.write_all(b"\n").unwrap();
+    }
+
+    writer.write_all(formatted.as_bytes()).unwrap()
+}
+
+fn comment_out(s: &str) -> String {
+    s.split('\n')
+        .map(|line| format!("// {line}"))
+        .collect::<Vec<String>>()
+        .join("\n")
 }

examples/Cargo.toml

@@ -118,8 +118,13 @@ path = "src/tracing/server.rs"
 required-features = ["tracing"]
 
 [[bin]]
-name = "uds-client"
-path = "src/uds/client.rs"
+name = "uds-client-standard"
+path = "src/uds/client_standard.rs"
+required-features = ["uds"]
+
+[[bin]]
+name = "uds-client-with-connector"
+path = "src/uds/client_with_connector.rs"
 required-features = ["uds"]
 
 [[bin]]
@@ -285,7 +290,7 @@ async-stream = { version = "0.3", optional = true }
 tokio-stream = { version = "0.1", optional = true }
 tokio-util = { version = "0.7.8", optional = true }
 tower = { version = "0.5", optional = true }
-rand = { version = "0.8", optional = true }
+rand = { version = "0.9", optional = true }
 serde = { version = "1.0", features = ["derive"], optional = true }
 serde_json = { version = "1.0", optional = true }
 tracing = { version = "0.1.16", optional = true }

examples/routeguide-tutorial.md

@@ -693,8 +693,8 @@ use rand::Rng;
 
 ```rust
 async fn run_record_route(client: &mut RouteGuideClient<Channel>) -> Result<(), Box<dyn Error>> {
-    let mut rng = rand::thread_rng();
-    let point_count: i32 = rng.gen_range(2..100);
+    let mut rng = rand::rng();
+    let point_count: i32 = rng.random_range(2..100);
 
     let mut points = vec![];
     for _ in 0..=point_count {
@@ -715,8 +715,8 @@ async fn run_record_route(client: &mut RouteGuideClient<Channel>) -> Result<(),
 
 ```rust
 fn random_point(rng: &mut ThreadRng) -> Point {
-    let latitude = (rng.gen_range(0..180) - 90) * 10_000_000;
-    let longitude = (rng.gen_range(0..360) - 180) * 10_000_000;
+    let latitude = (rng.random_range(0..180) - 90) * 10_000_000;
+    let longitude = (rng.random_range(0..360) - 180) * 10_000_000;
     Point {
         latitude,
         longitude,

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