Skip to content

Fix(server): server deprecation warnings #3165

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Mar 9, 2023
Merged

Fix(server): server deprecation warnings #3165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/server/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ pub use self::server::Server;
cfg_feature! {
#![any(feature = "http1", feature = "http2")]

#[cfg_attr(feature = "deprecated", allow(deprecated))]
pub(crate) mod server;
pub use self::server::Builder;

Expand Down
8 changes: 0 additions & 8 deletions src/server/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ use crate::common::exec::{ConnStreamExec, NewSvcExec};
use crate::common::{task, Future, Pin, Poll, Unpin};
// Renamed `Http` as `Http_` for now so that people upgrading don't see an
// error that `hyper::server::Http` is private...
#[cfg_attr(feature = "deprecated", allow(deprecated))]
use super::conn::{Connection, Http as Http_, UpgradeableConnection};
use super::shutdown::{Graceful, GracefulWatcher};
use crate::service::{HttpService, MakeServiceRef};
Expand All @@ -34,7 +33,6 @@ pin_project! {
/// handlers. It is built using the [`Builder`](Builder), and the future
/// completes when the server has been shutdown. It should be run by an
/// `Executor`.
#[cfg_attr(feature = "deprecated", allow(deprecated))]
pub struct Server<I, S, E = Exec> {
#[pin]
incoming: I,
Expand All @@ -46,7 +44,6 @@ pin_project! {
/// A builder for a [`Server`](Server).
#[derive(Debug)]
#[cfg_attr(docsrs, doc(cfg(any(feature = "http1", feature = "http2"))))]
#[cfg_attr(feature = "deprecated", allow(deprecated))]
pub struct Builder<I, E = Exec> {
incoming: I,
protocol: Http_<E>,
Expand All @@ -55,7 +52,6 @@ pub struct Builder<I, E = Exec> {
// ===== impl Server =====

#[cfg_attr(docsrs, doc(cfg(any(feature = "http1", feature = "http2"))))]
#[cfg_attr(feature = "deprecated", allow(deprecated))]
impl<I> Server<I, ()> {
/// Starts a [`Builder`](Builder) with the provided incoming stream.
pub fn builder(incoming: I) -> Builder<I> {
Expand Down Expand Up @@ -109,7 +105,6 @@ impl<S, E> Server<AddrIncoming, S, E> {
}

#[cfg_attr(docsrs, doc(cfg(any(feature = "http1", feature = "http2"))))]
#[cfg_attr(feature = "deprecated", allow(deprecated))]
impl<I, IO, IE, S, E, B> Server<I, S, E>
where
I: Accept<Conn = IO, Error = IE>,
Expand Down Expand Up @@ -212,7 +207,6 @@ where
}

#[cfg_attr(docsrs, doc(cfg(any(feature = "http1", feature = "http2"))))]
#[cfg_attr(feature = "deprecated", allow(deprecated))]
impl<I, IO, IE, S, B, E> Future for Server<I, S, E>
where
I: Accept<Conn = IO, Error = IE>,
Expand Down Expand Up @@ -243,7 +237,6 @@ impl<I: fmt::Debug, S: fmt::Debug> fmt::Debug for Server<I, S> {
// ===== impl Builder =====

#[cfg_attr(docsrs, doc(cfg(any(feature = "http1", feature = "http2"))))]
#[cfg_attr(feature = "deprecated", allow(deprecated))]
impl<I, E> Builder<I, E> {
/// Start a new builder, wrapping an incoming stream and low-level options.
///
Expand Down Expand Up @@ -778,7 +771,6 @@ pin_project! {
#[must_use = "futures do nothing unless polled"]
#[derive(Debug)]
#[cfg_attr(docsrs, doc(cfg(any(feature = "http1", feature = "http2"))))]
#[cfg_attr(feature = "deprecated", allow(deprecated))]
pub struct Connecting<I, F, E = Exec> {
#[pin]
future: F,
Expand Down