Merge branch 'main' into trace-debug-not-info

Author: tikue

example-service/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "tarpc-example-service"
 version = "0.17.0"
-rust-version = "1.65.0"
+rust-version = "1.85.0"
 authors = ["Tim Kuehn <tikue@google.com>"]
-edition = "2021"
+edition = "2024"
 license = "MIT"
 documentation = "https://docs.rs/tarpc-example-service"
 homepage = "https://github.com/google/tarpc"

example-service/src/client.rs

@@ -5,7 +5,7 @@
 // https://opensource.org/licenses/MIT.
 
 use clap::Parser;
-use service::{init_tracing, WorldClient};
+use service::{WorldClient, init_tracing};
 use std::{net::SocketAddr, time::Duration};
 use tarpc::{client, context, tokio_serde::formats::Json};
 use tokio::time::sleep;

example-service/src/server.rs

@@ -10,14 +10,14 @@ use rand::{
     distributions::{Distribution, Uniform},
     thread_rng,
 };
-use service::{init_tracing, World};
+use service::{World, init_tracing};
 use std::{
     net::{IpAddr, Ipv6Addr, SocketAddr},
     time::Duration,
 };
 use tarpc::{
     context,
-    server::{self, incoming::Incoming, Channel},
+    server::{self, Channel, incoming::Incoming},
     tokio_serde::formats::Json,
 };
 use tokio::time;

hooks/pre-commit

@@ -93,7 +93,7 @@ diff=""
 for file in $(git diff --name-only --cached);
 do
 	if [ ${file: -3} == ".rs" ]; then
-        diff="$diff$(rustfmt --edition 2018 --check $file)"
+        diff="$diff$(rustfmt --edition 2024 --check $file)"
         if [ $? != 0 ]; then
             FMTRESULT=1
         fi

plugins/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "tarpc-plugins"
 version = "0.14.1"
-rust-version = "1.65.0"
+rust-version = "1.85.0"
 authors = ["Adam Wright <adam.austin.wright@gmail.com>", "Tim Kuehn <timothy.j.kuehn@gmail.com>"]
-edition = "2021"
+edition = "2024"
 license = "MIT"
 documentation = "https://docs.rs/tarpc-plugins"
 homepage = "https://github.com/google/tarpc"

plugins/rustfmt.toml

@@ -1 +1 @@
-edition = "2018"
+edition = "2024"

plugins/src/lib.rs

@@ -13,17 +13,16 @@ extern crate syn;
 
 use proc_macro::TokenStream;
 use proc_macro2::TokenStream as TokenStream2;
-use quote::{format_ident, quote, ToTokens};
+use quote::{ToTokens, format_ident, quote};
 use syn::{
-    braced,
+    AttrStyle, Attribute, Expr, FnArg, Ident, Lit, LitBool, MetaNameValue, Pat, PatType, Path,
+    ReturnType, Token, Type, Visibility, braced,
     ext::IdentExt,
     parenthesized,
     parse::{Parse, ParseStream},
     parse_macro_input, parse_quote,
     spanned::Spanned,
     token::Comma,
-    AttrStyle, Attribute, Expr, FnArg, Ident, Lit, LitBool, MetaNameValue, Pat, PatType, Path,
-    ReturnType, Token, Type, Visibility,
 };
 
 /// Accumulates multiple errors into a result.
@@ -339,12 +338,12 @@ impl Parse for DeriveMeta {
 #[proc_macro_attribute]
 #[cfg(feature = "serde1")]
 pub fn derive_serde(_attr: TokenStream, item: TokenStream) -> TokenStream {
-    let mut gen: proc_macro2::TokenStream = quote! {
+    let mut derives: proc_macro2::TokenStream = quote! {
         #[derive(::tarpc::serde::Serialize, ::tarpc::serde::Deserialize)]
         #[serde(crate = "::tarpc::serde")]
     };
-    gen.extend(proc_macro2::TokenStream::from(item));
-    proc_macro::TokenStream::from(gen)
+    derives.extend(proc_macro2::TokenStream::from(item));
+    proc_macro::TokenStream::from(derives)
 }
 
 fn collect_cfg_attrs(rpcs: &[RpcMethod]) -> Vec<Vec<&Attribute>> {

tarpc/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "tarpc"
 version = "0.37.0"
-rust-version = "1.65.0"
+rust-version = "1.85.0"
 authors = [
     "Adam Wright <adam.austin.wright@gmail.com>",
     "Tim Kuehn <timothy.j.kuehn@gmail.com>",
 ]
-edition = "2021"
+edition = "2024"
 license = "MIT"
 documentation = "https://docs.rs/tarpc"
 homepage = "https://github.com/google/tarpc"
@@ -64,7 +64,7 @@ opentelemetry-semantic-conventions = "0.30.0"
 
 [dev-dependencies]
 assert_matches = "1.4"
-bincode = "1.3"
+bincode = { version = "2.0", features = ["serde"] }
 bytes = { version = "1", features = ["serde"] }
 flate2 = "1.0"
 futures-test = "0.3"

tarpc/examples/compression.rs

@@ -4,8 +4,8 @@
 // license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
-use flate2::{read::DeflateDecoder, write::DeflateEncoder, Compression};
-use futures::{prelude::*, Sink, SinkExt, Stream, StreamExt, TryStreamExt};
+use flate2::{Compression, read::DeflateDecoder, write::DeflateEncoder};
+use futures::{Sink, SinkExt, Stream, StreamExt, TryStreamExt, prelude::*};
 use serde::{Deserialize, Serialize};
 use serde_bytes::ByteBuf;
 use std::{io, io::Read, io::Write};
@@ -74,7 +74,7 @@ where
 }
 
 fn serialize<T: Serialize>(t: T) -> io::Result<ByteBuf> {
-    bincode::serialize(&t)
+    bincode::serde::encode_to_vec(&t, bincode::config::standard())
         .map(ByteBuf::from)
         .map_err(io::Error::other)
 }
@@ -83,12 +83,14 @@ fn deserialize<D>(message: ByteBuf) -> io::Result<D>
 where
     for<'a> D: Deserialize<'a>,
 {
-    bincode::deserialize(message.as_ref()).map_err(io::Error::other)
+    let (d, _) = bincode::serde::decode_from_slice(message.as_ref(), bincode::config::standard())
+        .map_err(io::Error::other)?;
+    Ok(d)
 }
 
 fn add_compression<In, Out>(
     transport: impl Stream<Item = io::Result<CompressedMessage<In>>>
-        + Sink<CompressedMessage<Out>, Error = io::Error>,
+    + Sink<CompressedMessage<Out>, Error = io::Error>,
 ) -> impl Stream<Item = io::Result<In>> + Sink<Out, Error = io::Error>
 where
     Out: Serialize,

tarpc/examples/pubsub.rs

@@ -113,7 +113,7 @@ impl Subscriber {
                 return Err(anyhow!(
                     "[{}] Server never initialized the subscriber.",
                     local_addr
-                ))
+                ));
             }
         };
         let (handler, abort_handle) =