Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(channel): Make channel feature additive #1574

Merged
merged 14 commits into from
Jun 19, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore(channel): Move user_agent service to channel module
tottoto committed Jun 15, 2024

Verified

This commit was signed with the committer’s verified signature. The key has expired.
mmarchini mary marchini
commit 9b218953fe375508717fc7eccfa09b0bd2d7e04e
3 changes: 3 additions & 0 deletions tonic/src/transport/channel/service/mod.rs
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
pub(crate) mod add_origin;
pub(crate) use self::add_origin::AddOrigin;

pub(crate) mod user_agent;
pub(crate) use self::user_agent::UserAgent;
File renamed without changes.
4 changes: 2 additions & 2 deletions tonic/src/transport/service/connection.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use super::SharedExec;
use super::{grpc_timeout::GrpcTimeout, reconnect::Reconnect, UserAgent};
use super::{grpc_timeout::GrpcTimeout, reconnect::Reconnect};
use crate::{
body::{boxed, BoxBody},
transport::channel::service::AddOrigin,
transport::channel::service::{AddOrigin, UserAgent},
transport::{BoxFuture, Endpoint},
};
use http::Uri;
4 changes: 0 additions & 4 deletions tonic/src/transport/service/mod.rs
Original file line number Diff line number Diff line change
@@ -12,8 +12,6 @@ mod io;
mod reconnect;
#[cfg(feature = "tls")]
mod tls;
#[cfg(feature = "channel")]
mod user_agent;

#[cfg(feature = "channel")]
pub(crate) use self::connection::Connection;
@@ -29,5 +27,3 @@ pub(crate) use self::io::ServerIo;
pub(crate) use self::tls::TlsAcceptor;
#[cfg(all(feature = "channel", feature = "tls"))]
pub(crate) use self::tls::TlsConnector;
#[cfg(feature = "channel")]
pub(crate) use self::user_agent::UserAgent;