chore: update rust edition and version to 2024 and 1.88, respectively

.github/workflows/CI.yml

@@ -204,7 +204,7 @@ jobs:
     - uses: actions/checkout@v6
     - uses: dtolnay/rust-toolchain@master
       with:
-        toolchain: nightly-2025-03-27
+        toolchain: nightly-2025-10-18
     - uses: taiki-e/install-action@cargo-hack
     - uses: taiki-e/install-action@cargo-udeps
     - name: Restore protoc and plugin from cache

Cargo.toml

@@ -31,7 +31,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-rust-version = "1.75"
+rust-version = "1.88"
 
 [workspace.lints.rust]
 missing_debug_implementations = "warn"

README.md

@@ -46,7 +46,7 @@ may be a good resource as it shows examples of many of the gRPC features.
 
 ### Rust Version
 
-`tonic`'s MSRV is `1.75`.
+`tonic`'s MSRV is `1.88`.
 
 ### Dependencies
 

codegen/Cargo.toml

@@ -2,7 +2,8 @@
 name = "codegen"
 authors = ["Lucio Franco <luciofranco14@gmail.com>"]
 license = "MIT"
-edition = "2021"
+edition = "2024"
+rust-version = { workspace = true }
 
 [dependencies]
 protox = "0.9"

examples/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 authors = ["Lucio Franco <luciofranco14@gmail.com>"]
-edition = "2021"
+edition = "2024"
 license = "MIT"
 name = "examples"
 

examples/src/authentication/client.rs

@@ -2,8 +2,8 @@ pub mod pb {
     tonic::include_proto!("grpc.examples.unaryecho");
 }
 
-use pb::{echo_client::EchoClient, EchoRequest};
-use tonic::{metadata::MetadataValue, transport::Channel, Request};
+use pb::{EchoRequest, echo_client::EchoClient};
+use tonic::{Request, metadata::MetadataValue, transport::Channel};
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {

examples/src/authentication/server.rs

@@ -3,7 +3,7 @@ pub mod pb {
 }
 
 use pb::{EchoRequest, EchoResponse};
-use tonic::{metadata::MetadataValue, transport::Server, Request, Response, Status};
+use tonic::{Request, Response, Status, metadata::MetadataValue, transport::Server};
 
 type EchoResult<T> = Result<Response<T>, Status>;
 

examples/src/autoreload/server.rs

@@ -1,4 +1,4 @@
-use tonic::{transport::Server, Request, Response, Status};
+use tonic::{Request, Response, Status, transport::Server};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};
 use hello_world::{HelloReply, HelloRequest};

examples/src/blocking/client.rs

@@ -4,7 +4,7 @@ pub mod hello_world {
     tonic::include_proto!("helloworld");
 }
 
-use hello_world::{greeter_client::GreeterClient, HelloReply, HelloRequest};
+use hello_world::{HelloReply, HelloRequest, greeter_client::GreeterClient};
 
 type StdError = Box<dyn std::error::Error + Send + Sync + 'static>;
 type Result<T, E = StdError> = ::std::result::Result<T, E>;

examples/src/blocking/server.rs

@@ -1,4 +1,4 @@
-use tonic::{transport::Server, Request, Response, Status};
+use tonic::{Request, Response, Status, transport::Server};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};
 use hello_world::{HelloReply, HelloRequest};

examples/src/cancellation/client.rs

@@ -1,7 +1,7 @@
-use hello_world::greeter_client::GreeterClient;
 use hello_world::HelloRequest;
+use hello_world::greeter_client::GreeterClient;
 
-use tokio::time::{timeout, Duration};
+use tokio::time::{Duration, timeout};
 
 pub mod hello_world {
     tonic::include_proto!("helloworld");

examples/src/cancellation/server.rs

@@ -1,14 +1,14 @@
 use std::future::Future;
 
 use tokio_util::sync::CancellationToken;
-use tonic::{transport::Server, Request, Response, Status};
+use tonic::{Request, Response, Status, transport::Server};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};
 use hello_world::{HelloReply, HelloRequest};
 
 use tokio::select;
-use tokio::time::sleep;
 use tokio::time::Duration;
+use tokio::time::sleep;
 
 pub mod hello_world {
     tonic::include_proto!("helloworld");

examples/src/codec_buffers/server.rs

@@ -5,16 +5,16 @@
 //! The generated code assumes that a module `crate::common` exists which defines
 //! `SmallBufferCodec`, and `SmallBufferCodec` must have a Default implementation.
 
-use tonic::{transport::Server, Request, Response, Status};
+use tonic::{Request, Response, Status, transport::Server};
 
 pub mod common;
 
 pub mod small_buf {
     include!(concat!(env!("OUT_DIR"), "/smallbuf/helloworld.rs"));
 }
 use small_buf::{
-    greeter_server::{Greeter, GreeterServer},
     HelloReply, HelloRequest,
+    greeter_server::{Greeter, GreeterServer},
 };
 
 #[derive(Default)]

examples/src/compression/client.rs

@@ -1,5 +1,5 @@
-use hello_world::greeter_client::GreeterClient;
 use hello_world::HelloRequest;
+use hello_world::greeter_client::GreeterClient;
 use tonic::codec::CompressionEncoding;
 use tonic::transport::Channel;
 

examples/src/compression/server.rs

@@ -1,4 +1,4 @@
-use tonic::{transport::Server, Request, Response, Status};
+use tonic::{Request, Response, Status, transport::Server};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};
 use hello_world::{HelloReply, HelloRequest};

examples/src/dynamic/server.rs

@@ -1,5 +1,5 @@
 use std::env;
-use tonic::{service::RoutesBuilder, transport::Server, Request, Response, Status};
+use tonic::{Request, Response, Status, service::RoutesBuilder, transport::Server};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};
 use hello_world::{HelloReply, HelloRequest};

examples/src/dynamic_load_balance/client.rs

@@ -2,10 +2,10 @@ pub mod pb {
     tonic::include_proto!("grpc.examples.unaryecho");
 }
 
-use pb::{echo_client::EchoClient, EchoRequest};
-use tonic::transport::channel::Change;
+use pb::{EchoRequest, echo_client::EchoClient};
 use tonic::transport::Channel;
 use tonic::transport::Endpoint;
+use tonic::transport::channel::Change;
 
 use std::sync::Arc;
 

examples/src/dynamic_load_balance/server.rs

@@ -4,7 +4,7 @@ pub mod pb {
 
 use std::net::SocketAddr;
 use tokio::sync::mpsc;
-use tonic::{transport::Server, Request, Response, Status};
+use tonic::{Request, Response, Status, transport::Server};
 
 use pb::{EchoRequest, EchoResponse};
 

examples/src/gcp/client.rs

@@ -2,11 +2,11 @@ pub mod api {
     tonic::include_proto!("google.pubsub.v1");
 }
 
-use api::{publisher_client::PublisherClient, ListTopicsRequest};
+use api::{ListTopicsRequest, publisher_client::PublisherClient};
 use tonic::{
+    Request,
     metadata::MetadataValue,
     transport::{Certificate, Channel, ClientTlsConfig},
-    Request,
 };
 
 const ENDPOINT: &str = "https://pubsub.googleapis.com";

examples/src/grpc-web/client.rs

@@ -1,4 +1,4 @@
-use hello_world::{greeter_client::GreeterClient, HelloRequest};
+use hello_world::{HelloRequest, greeter_client::GreeterClient};
 use hyper_util::rt::TokioExecutor;
 use tonic_web::GrpcWebClientLayer;
 

examples/src/grpc-web/server.rs

@@ -1,4 +1,4 @@
-use tonic::{service::LayerExt as _, transport::Server, Request, Response, Status};
+use tonic::{Request, Response, Status, service::LayerExt as _, transport::Server};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};
 use hello_world::{HelloReply, HelloRequest};

examples/src/h2c/client.rs

@@ -1,5 +1,5 @@
-use hello_world::greeter_client::GreeterClient;
 use hello_world::HelloRequest;
+use hello_world::greeter_client::GreeterClient;
 use http::Uri;
 use hyper_util::client::legacy::Client;
 use hyper_util::rt::TokioExecutor;
@@ -36,7 +36,7 @@ mod h2c {
 
     use hyper::body::Incoming;
     use hyper_util::{
-        client::legacy::{connect::HttpConnector, Client},
+        client::legacy::{Client, connect::HttpConnector},
         rt::TokioExecutor,
     };
     use tonic::body::Body;

examples/src/h2c/server.rs

@@ -4,7 +4,7 @@ use hyper_util::rt::{TokioExecutor, TokioIo};
 use hyper_util::server::conn::auto::Builder;
 use hyper_util::service::TowerToHyperService;
 use tokio::net::TcpListener;
-use tonic::{service::Routes, Request, Response, Status};
+use tonic::{Request, Response, Status, service::Routes};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};
 use hello_world::{HelloReply, HelloRequest};

examples/src/health/server.rs

@@ -1,4 +1,4 @@
-use tonic::{transport::Server, Request, Response, Status};
+use tonic::{Request, Response, Status, transport::Server};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};
 use hello_world::{HelloReply, HelloRequest};

examples/src/helloworld/client.rs

@@ -1,5 +1,5 @@
-use hello_world::greeter_client::GreeterClient;
 use hello_world::HelloRequest;
+use hello_world::greeter_client::GreeterClient;
 
 pub mod hello_world {
     tonic::include_proto!("helloworld");

examples/src/helloworld/server.rs

@@ -1,4 +1,4 @@
-use tonic::{transport::Server, Request, Response, Status};
+use tonic::{Request, Response, Status, transport::Server};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};
 use hello_world::{HelloReply, HelloRequest};

examples/src/interceptor/client.rs

@@ -1,10 +1,10 @@
-use hello_world::greeter_client::GreeterClient;
 use hello_world::HelloRequest;
+use hello_world::greeter_client::GreeterClient;
 use tonic::{
+    Request, Status,
     codegen::InterceptedService,
     service::Interceptor,
     transport::{Channel, Endpoint},
-    Request, Status,
 };
 
 pub mod hello_world {

examples/src/interceptor/server.rs

@@ -1,4 +1,4 @@
-use tonic::{transport::Server, Request, Response, Status};
+use tonic::{Request, Response, Status, transport::Server};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};
 use hello_world::{HelloReply, HelloRequest};

examples/src/json-codec/common.rs

@@ -6,8 +6,8 @@ use bytes::{Buf, BufMut};
 use serde::{Deserialize, Serialize};
 use std::marker::PhantomData;
 use tonic::{
-    codec::{Codec, DecodeBuf, Decoder, EncodeBuf, Encoder},
     Status,
+    codec::{Codec, DecodeBuf, Decoder, EncodeBuf, Encoder},
 };
 
 #[derive(Debug, Deserialize, Serialize)]

examples/src/json-codec/server.rs

@@ -4,7 +4,7 @@
 //! in the `examples/build.rs` file. As defined there, the generated code assumes that a module
 //! `crate::common` exists which defines `HelloRequest`, `HelloResponse`, and `JsonCodec`.
 
-use tonic::{transport::Server, Request, Response, Status};
+use tonic::{Request, Response, Status, transport::Server};
 
 pub mod common;
 use common::{HelloRequest, HelloResponse};

examples/src/load_balance/client.rs

@@ -2,7 +2,7 @@ pub mod pb {
     tonic::include_proto!("grpc.examples.unaryecho");
 }
 
-use pb::{echo_client::EchoClient, EchoRequest};
+use pb::{EchoRequest, echo_client::EchoClient};
 use tonic::transport::Channel;
 
 #[tokio::main]

examples/src/load_balance/server.rs

@@ -4,7 +4,7 @@ pub mod pb {
 
 use std::net::SocketAddr;
 use tokio::sync::mpsc;
-use tonic::{transport::Server, Request, Response, Status};
+use tonic::{Request, Response, Status, transport::Server};
 
 use pb::{EchoRequest, EchoResponse};
 

examples/src/mock/mock.rs

@@ -1,7 +1,7 @@
 use hyper_util::rt::TokioIo;
 use tonic::{
-    transport::{Endpoint, Server, Uri},
     Request, Response, Status,
+    transport::{Endpoint, Server, Uri},
 };
 use tower::service_fn;
 
@@ -10,9 +10,9 @@ pub mod hello_world {
 }
 
 use hello_world::{
+    HelloReply, HelloRequest,
     greeter_client::GreeterClient,
     greeter_server::{Greeter, GreeterServer},
-    HelloReply, HelloRequest,
 };
 
 #[tokio::main]

examples/src/multiplex/client.rs

@@ -6,8 +6,8 @@ pub mod echo {
     tonic::include_proto!("grpc.examples.unaryecho");
 }
 
-use echo::{echo_client::EchoClient, EchoRequest};
-use hello_world::{greeter_client::GreeterClient, HelloRequest};
+use echo::{EchoRequest, echo_client::EchoClient};
+use hello_world::{HelloRequest, greeter_client::GreeterClient};
 use tonic::transport::Endpoint;
 
 #[tokio::main]

examples/src/multiplex/server.rs

@@ -1,4 +1,4 @@
-use tonic::{transport::Server, Request, Response, Status};
+use tonic::{Request, Response, Status, transport::Server};
 
 pub mod hello_world {
     tonic::include_proto!("helloworld");
@@ -9,13 +9,13 @@ pub mod echo {
 }
 
 use hello_world::{
-    greeter_server::{Greeter, GreeterServer},
     HelloReply, HelloRequest,
+    greeter_server::{Greeter, GreeterServer},
 };
 
 use echo::{
-    echo_server::{Echo, EchoServer},
     EchoRequest, EchoResponse,
+    echo_server::{Echo, EchoServer},
 };
 
 #[tokio::main]

examples/src/richer-error/client.rs

@@ -1,7 +1,7 @@
 use tonic_types::StatusExt;
 
-use hello_world::greeter_client::GreeterClient;
 use hello_world::HelloRequest;
+use hello_world::greeter_client::GreeterClient;
 
 pub mod hello_world {
     tonic::include_proto!("helloworld");

examples/src/richer-error/client_vec.rs

@@ -1,7 +1,7 @@
 use tonic_types::{ErrorDetail, StatusExt};
 
-use hello_world::greeter_client::GreeterClient;
 use hello_world::HelloRequest;
+use hello_world::greeter_client::GreeterClient;
 
 pub mod hello_world {
     tonic::include_proto!("helloworld");

examples/src/richer-error/server.rs

@@ -1,4 +1,4 @@
-use tonic::{transport::Server, Code, Request, Response, Status};
+use tonic::{Code, Request, Response, Status, transport::Server};
 use tonic_types::{ErrorDetails, StatusExt};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};

examples/src/richer-error/server_vec.rs

@@ -1,4 +1,4 @@
-use tonic::{transport::Server, Code, Request, Response, Status};
+use tonic::{Code, Request, Response, Status, transport::Server};
 use tonic_types::{BadRequest, Help, LocalizedMessage, StatusExt};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};

examples/src/routeguide/client.rs

@@ -1,11 +1,11 @@
 use std::error::Error;
 use std::time::Duration;
 
-use rand::rngs::ThreadRng;
 use rand::Rng;
+use rand::rngs::ThreadRng;
 use tokio::time;
-use tonic::transport::Channel;
 use tonic::Request;
+use tonic::transport::Channel;
 
 use routeguide::route_guide_client::RouteGuideClient;
 use routeguide::{Point, Rectangle, RouteNote};