hyperium · Jul 8, 2024 · Jul 9, 2024 · Jul 13, 2024 · Jul 13, 2024 · Jul 13, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,10 @@
-# [v0.12.0](https://github.com/hyperium/tonic/compare/v0.11.0...v0.12.0) (2024-06-20)
+# [0.12.1](https://github.com/hyperium/tonic/compare/v0.12.0...v0.12.1) (2024-07-17)
+
+### Bug Fixes
+
+* Reduce tokio-stream feature (#1795)
+
+# [0.12.0](https://github.com/hyperium/tonic/compare/v0.11.0...v0.12.0) (2024-07-08)
 
 This breaking release updates tonic to the hyper `1.0` ecosystem and also updates
 to prost `v0.13.0`.
@@ -30,6 +36,7 @@ to prost `v0.13.0`.
 * `tonic_reflection::server` is updated to use the generated
   `tonic_reflection::pb::v1` code.
 * Make compression encoding configuration more malleable (#1757)
+* Removed implicit configuration of client TLS roots setup (#1731)
 
 
 [v1.8.8]: https://github.com/fullstorydev/grpcurl/releases/tag/v1.8.8

diff --git a/examples/helloworld-tutorial.md b/examples/helloworld-tutorial.md
@@ -113,7 +113,7 @@ path = "src/client.rs"
 
 [dependencies]
 tonic = "0.12"
-prost = "0.12"
+prost = "0.13"
 tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }
 
 [build-dependencies]

diff --git a/examples/routeguide-tutorial.md b/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 = "0.12"
-prost = "0.12"
+prost = "0.13"
 tokio = { version = "1.0", features = ["rt-multi-thread", "macros", "sync", "time"] }
 tokio-stream = "0.1"
 
@@ -498,7 +498,7 @@ async fn route_chat(
         while let Some(note) = stream.next().await {
             let note = note?;
 
-            let location = note.location.clone().unwrap();
+            let location = note.location.unwrap();
 
             let location_notes = notes.entry(location).or_insert(vec![]);
             location_notes.push(note);

diff --git a/examples/src/routeguide/server.rs b/examples/src/routeguide/server.rs
@@ -116,7 +116,7 @@ impl RouteGuide for RouteGuideService {
             while let Some(note) = stream.next().await {
                 let note = note?;
 
-                let location = note.location.clone().unwrap();
+                let location = note.location.unwrap();
 
                 let location_notes = notes.entry(location).or_insert(vec![]);
                 location_notes.push(note);

diff --git a/tonic-build/Cargo.toml b/tonic-build/Cargo.toml
@@ -4,15 +4,15 @@ categories = ["network-programming", "asynchronous"]
 description = """
 Codegen module of `tonic` gRPC implementation.
 """
-documentation = "https://docs.rs/tonic-build/0.12.0"
+documentation = "https://docs.rs/tonic-build/0.12.1"
 edition = "2021"
 homepage = "https://github.com/hyperium/tonic"
 keywords = ["rpc", "grpc", "async", "codegen", "protobuf"]
 license = "MIT"
 name = "tonic-build"
 readme = "README.md"
 repository = "https://github.com/hyperium/tonic"
-version = "0.12.0"
+version = "0.12.1"
 
 [dependencies]
 prettyplease = { version = "0.2" }

diff --git a/tonic-build/src/lib.rs b/tonic-build/src/lib.rs
@@ -70,7 +70,7 @@
     html_logo_url = "https://raw.githubusercontent.com/tokio-rs/website/master/public/img/icons/tonic.svg"
 )]
 #![deny(rustdoc::broken_intra_doc_links)]
-#![doc(html_root_url = "https://docs.rs/tonic-build/0.12.0")]
+#![doc(html_root_url = "https://docs.rs/tonic-build/0.12.1")]
 #![doc(issue_tracker_base_url = "https://github.com/hyperium/tonic/issues/")]
 #![doc(test(no_crate_inject, attr(deny(rust_2018_idioms))))]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]

diff --git a/tonic-health/Cargo.toml b/tonic-health/Cargo.toml
@@ -4,15 +4,15 @@ categories = ["network-programming", "asynchronous"]
 description = """
 Health Checking module of `tonic` gRPC implementation.
 """
-documentation = "https://docs.rs/tonic-health/0.12.0"
+documentation = "https://docs.rs/tonic-health/0.12.1"
 edition = "2021"
 homepage = "https://github.com/hyperium/tonic"
 keywords = ["rpc", "grpc", "async", "healthcheck"]
 license = "MIT"
 name = "tonic-health"
 readme = "README.md"
 repository = "https://github.com/hyperium/tonic"
-version = "0.12.0"
+version = "0.12.1"
 
 [features]
 default = ["transport"]

diff --git a/tonic-health/src/lib.rs b/tonic-health/src/lib.rs
@@ -16,7 +16,7 @@
     html_logo_url = "https://raw.githubusercontent.com/tokio-rs/website/master/public/img/icons/tonic.svg"
 )]
 #![deny(rustdoc::broken_intra_doc_links)]
-#![doc(html_root_url = "https://docs.rs/tonic-health/0.12.0")]
+#![doc(html_root_url = "https://docs.rs/tonic-health/0.12.1")]
 #![doc(issue_tracker_base_url = "https://github.com/hyperium/tonic/issues/")]
 #![doc(test(no_crate_inject, attr(deny(rust_2018_idioms))))]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]

diff --git a/tonic-reflection/Cargo.toml b/tonic-reflection/Cargo.toml
@@ -9,13 +9,13 @@ Server Reflection module of `tonic` gRPC implementation.
 """
 edition = "2021"
 homepage = "https://github.com/hyperium/tonic"
-documentation = "https://docs.rs/tonic-reflection/0.12.0"
+documentation = "https://docs.rs/tonic-reflection/0.12.1"
 keywords = ["rpc", "grpc", "async", "reflection"]
 license = "MIT"
 name = "tonic-reflection"
 readme = "README.md"
 repository = "https://github.com/hyperium/tonic"
-version = "0.12.0"
+version = "0.12.1"
 
 [package.metadata.docs.rs]
 all-features = true

diff --git a/tonic-reflection/src/lib.rs b/tonic-reflection/src/lib.rs
@@ -10,7 +10,7 @@
     html_logo_url = "https://github.com/hyperium/tonic/raw/master/.github/assets/tonic-docs.png"
 )]
 #![deny(rustdoc::broken_intra_doc_links)]
-#![doc(html_root_url = "https://docs.rs/tonic-reflection/0.12.0")]
+#![doc(html_root_url = "https://docs.rs/tonic-reflection/0.12.1")]
 #![doc(issue_tracker_base_url = "https://github.com/hyperium/tonic/issues/")]
 #![doc(test(no_crate_inject, attr(deny(rust_2018_idioms))))]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]

diff --git a/tonic-reflection/src/server/mod.rs b/tonic-reflection/src/server/mod.rs
@@ -0,0 +1,36 @@
+pub use crate::pb::v1::server_reflection_server::{ServerReflection, ServerReflectionServer};
+
+use prost::DecodeError;
+use std::fmt::{Display, Formatter};
+
+mod v1;
+
+pub use v1::Builder;
+
+/// Represents an error in the construction of a gRPC Reflection Service.
+#[derive(Debug)]
+pub enum Error {
+    /// An error was encountered decoding a `prost_types::FileDescriptorSet` from a buffer.
+    DecodeError(prost::DecodeError),
+    /// An invalid `prost_types::FileDescriptorProto` was encountered.
+    InvalidFileDescriptorSet(String),
+}
+
+impl From<DecodeError> for Error {
+    fn from(e: DecodeError) -> Self {
+        Error::DecodeError(e)
+    }
+}
+
+impl std::error::Error for Error {}
+
+impl Display for Error {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Error::DecodeError(_) => f.write_str("error decoding FileDescriptorSet from buffer"),
+            Error::InvalidFileDescriptorSet(s) => {
+                write!(f, "invalid FileDescriptorSet - {}", s)
+            }
+        }
+    }
+}
diff --git a/tonic-reflection/src/server.rs → tonic-reflection/src/server/v1.rs b/tonic-reflection/src/server.rs → tonic-reflection/src/server/v1.rs
@@ -1,50 +1,23 @@
-pub use crate::pb::v1::server_reflection_server::{ServerReflection, ServerReflectionServer};
+use crate::pb::v1::server_reflection_server::{ServerReflection, ServerReflectionServer};
 
 use crate::pb::v1::server_reflection_request::MessageRequest;
 use crate::pb::v1::server_reflection_response::MessageResponse;
 use crate::pb::v1::{
     ExtensionNumberResponse, FileDescriptorResponse, ListServiceResponse, ServerReflectionRequest,
     ServerReflectionResponse, ServiceResponse,
 };
-use prost::{DecodeError, Message};
+use prost::Message;
 use prost_types::{
     DescriptorProto, EnumDescriptorProto, FieldDescriptorProto, FileDescriptorProto,
     FileDescriptorSet,
 };
 use std::collections::HashMap;
-use std::fmt::{Display, Formatter};
 use std::sync::Arc;
 use tokio::sync::mpsc;
 use tokio_stream::{wrappers::ReceiverStream, StreamExt};
 use tonic::{Request, Response, Status, Streaming};
 
-/// Represents an error in the construction of a gRPC Reflection Service.
-#[derive(Debug)]
-pub enum Error {
-    /// An error was encountered decoding a `prost_types::FileDescriptorSet` from a buffer.
-    DecodeError(prost::DecodeError),
-    /// An invalid `prost_types::FileDescriptorProto` was encountered.
-    InvalidFileDescriptorSet(String),
-}
-
-impl From<DecodeError> for Error {
-    fn from(e: DecodeError) -> Self {
-        Error::DecodeError(e)
-    }
-}
-
-impl std::error::Error for Error {}
-
-impl Display for Error {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Error::DecodeError(_) => f.write_str("error decoding FileDescriptorSet from buffer"),
-            Error::InvalidFileDescriptorSet(s) => {
-                write!(f, "invalid FileDescriptorSet - {}", s)
-            }
-        }
-    }
-}
+use crate::server::Error;
 
 /// A builder used to construct a gRPC Reflection Service.
 #[derive(Debug)]

diff --git a/tonic-types/Cargo.toml b/tonic-types/Cargo.toml
@@ -7,15 +7,15 @@ categories = ["web-programming", "network-programming", "asynchronous"]
 description = """
 A collection of useful protobuf types that can be used with `tonic`.
 """
-documentation = "https://docs.rs/tonic-types/0.12.0"
+documentation = "https://docs.rs/tonic-types/0.12.1"
 edition = "2021"
 homepage = "https://github.com/hyperium/tonic"
 keywords = ["rpc", "grpc", "protobuf"]
 license = "MIT"
 name = "tonic-types"
 readme = "README.md"
 repository = "https://github.com/hyperium/tonic"
-version = "0.12.0"
+version = "0.12.1"
 
 [dependencies]
 prost = "0.13"

diff --git a/tonic-types/src/lib.rs b/tonic-types/src/lib.rs
@@ -150,7 +150,7 @@
     html_logo_url = "https://raw.githubusercontent.com/tokio-rs/website/master/public/img/icons/tonic.svg"
 )]
 #![deny(rustdoc::broken_intra_doc_links)]
-#![doc(html_root_url = "https://docs.rs/tonic-types/0.12.0")]
+#![doc(html_root_url = "https://docs.rs/tonic-types/0.12.1")]
 #![doc(issue_tracker_base_url = "https://github.com/hyperium/tonic/issues/")]
 
 mod generated {

diff --git a/tonic-web/Cargo.toml b/tonic-web/Cargo.toml
@@ -4,15 +4,15 @@ categories = ["network-programming", "asynchronous"]
 description = """
 grpc-web protocol translation for tonic services.
 """
-documentation = "https://docs.rs/tonic-web/0.12.0"
+documentation = "https://docs.rs/tonic-web/0.12.1"
 edition = "2021"
 homepage = "https://github.com/hyperium/tonic"
 keywords = ["rpc", "grpc", "grpc-web"]
 license = "MIT"
 name = "tonic-web"
 readme = "README.md"
 repository = "https://github.com/hyperium/tonic"
-version = "0.12.0"
+version = "0.12.1"
 
 [dependencies]
 base64 = "0.22"

diff --git a/tonic-web/src/lib.rs b/tonic-web/src/lib.rs
@@ -94,7 +94,7 @@
     rust_2018_idioms,
     unreachable_pub
 )]
-#![doc(html_root_url = "https://docs.rs/tonic-web/0.12.0")]
+#![doc(html_root_url = "https://docs.rs/tonic-web/0.12.1")]
 #![doc(issue_tracker_base_url = "https://github.com/hyperium/tonic/issues/")]
 
 pub use call::GrpcWebCall;

diff --git a/tonic/Cargo.toml b/tonic/Cargo.toml
@@ -13,14 +13,14 @@ categories = ["web-programming", "network-programming", "asynchronous"]
 description = """
 A gRPC over HTTP/2 implementation focused on high performance, interoperability, and flexibility.
 """
-documentation = "https://docs.rs/tonic/0.12.0"
+documentation = "https://docs.rs/tonic/0.12.1"
 edition = "2021"
 homepage = "https://github.com/hyperium/tonic"
 keywords = ["rpc", "grpc", "async", "futures", "protobuf"]
 license = "MIT"
 readme = "../README.md"
 repository = "https://github.com/hyperium/tonic"
-version = "0.12.0"
+version = "0.12.1"
 
 [features]
 codegen = ["dep:async-trait"]
@@ -40,6 +40,7 @@ server = [
   "dep:hyper-util", "hyper-util?/service", "hyper-util?/server-auto",
   "dep:socket2",
   "dep:tokio", "tokio?/macros", "tokio?/net", "tokio?/time",
+  "tokio-stream/net",
   "dep:tower", "tower?/util", "tower?/limit",
 ]
 channel = [
@@ -67,6 +68,7 @@ percent-encoding = "2.1"
 pin-project = "1.0.11"
 tower-layer = "0.3"
 tower-service = "0.3"
+tokio-stream = {version = "0.1", default-features = false}
 
 # prost
 prost = {version = "0.13", default-features = false, features = ["std"], optional = true}
@@ -81,7 +83,6 @@ hyper = {version = "1", features = ["http1", "http2"], optional = true}
 hyper-util = { version = "0.1.4", features = ["tokio"], optional = true }
 socket2 = { version = "0.5", optional = true, features = ["all"] }
 tokio = {version = "1", default-features = false, optional = true}
-tokio-stream = { version = "0.1", features = ["net"] }
 tower = {version = "0.4.7", default-features = false, optional = true}
 axum = {version = "0.7", default-features = false, optional = true}
 

diff --git a/tonic/src/codec/compression.rs b/tonic/src/codec/compression.rs
@@ -188,7 +188,7 @@ impl fmt::Display for CompressionEncoding {
 }
 
 fn split_by_comma(s: &str) -> impl Iterator<Item = &str> {
-    s.trim().split(',').map(|s| s.trim())
+    s.split(',').map(|s| s.trim())
 }
 
 /// Compress `len` bytes from `decompressed_buf` into `out_buf`.

diff --git a/tonic/src/lib.rs b/tonic/src/lib.rs
@@ -88,7 +88,7 @@
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tokio-rs/website/master/public/img/icons/tonic.svg"
 )]
-#![doc(html_root_url = "https://docs.rs/tonic/0.12.0")]
+#![doc(html_root_url = "https://docs.rs/tonic/0.12.1")]
 #![doc(issue_tracker_base_url = "https://github.com/hyperium/tonic/issues/")]
 #![doc(test(no_crate_inject, attr(deny(rust_2018_idioms))))]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]

diff --git a/tonic/src/transport/channel/mod.rs b/tonic/src/transport/channel/mod.rs
@@ -157,7 +157,7 @@ impl Channel {
 
         let svc = Connection::lazy(connector, endpoint);
         let (svc, worker) = Buffer::pair(Either::A(svc), buffer_size);
-        executor.execute(Box::pin(worker));
+        executor.execute(worker);
 
         Channel { svc }
     }
@@ -176,7 +176,7 @@ impl Channel {
             .await
             .map_err(super::Error::from_source)?;
         let (svc, worker) = Buffer::pair(Either::A(svc), buffer_size);
-        executor.execute(Box::pin(worker));
+        executor.execute(worker);
 
         Ok(Channel { svc })
     }

diff --git a/tonic/src/transport/server/incoming.rs b/tonic/src/transport/server/incoming.rs
@@ -1,6 +1,6 @@
+use super::service::ServerIo;
 #[cfg(feature = "tls")]
 use super::service::TlsAcceptor;
-use super::{service::ServerIo, Connected};
 use std::{
     net::{SocketAddr, TcpListener as StdTcpListener},
     pin::{pin, Pin},
@@ -20,7 +20,7 @@ pub(crate) fn tcp_incoming<IO, IE>(
     incoming: impl Stream<Item = Result<IO, IE>>,
 ) -> impl Stream<Item = Result<ServerIo<IO>, crate::Error>>
 where
-    IO: AsyncRead + AsyncWrite + Connected + Unpin + Send + 'static,
+    IO: AsyncRead + AsyncWrite + Unpin + Send + 'static,
     IE: Into<crate::Error>,
 {
     async_stream::try_stream! {
@@ -38,7 +38,7 @@ pub(crate) fn tcp_incoming<IO, IE>(
     tls: Option<TlsAcceptor>,
 ) -> impl Stream<Item = Result<ServerIo<IO>, crate::Error>>
 where
-    IO: AsyncRead + AsyncWrite + Connected + Unpin + Send + 'static,
+    IO: AsyncRead + AsyncWrite + Unpin + Send + 'static,
     IE: Into<crate::Error>,
 {
     async_stream::try_stream! {