Skip to content

Commit 3c7bef3

Browse files
seanmonstarseanmonstar
authoredAug 1, 2022
feat(server): remove the high-level Server API (#2932)
This removes `hyper::Server`, and it's related parts: - `hyper::server::Builder` - `hyper::server::accept` - `hyper::service::make_service_fn` New utilities for managing servers will exist in `hyper-util`.
·
v1.6.0v1.0.0-rc.1
1 parent 491b076 commit 3c7bef3

File tree

13 files changed

+7
-1288
lines changed

13 files changed

+7
-1288
lines changed
 

‎src/common/drain.rs

-217
This file was deleted.

‎src/common/exec.rs

-36
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,17 @@ use std::future::Future;
33
use std::pin::Pin;
44
use std::sync::Arc;
55

6-
#[cfg(all(feature = "server", any(feature = "http1", feature = "http2")))]
7-
use crate::body::Body;
86
#[cfg(feature = "server")]
97
use crate::body::HttpBody;
108
#[cfg(all(feature = "http2", feature = "server"))]
119
use crate::proto::h2::server::H2Stream;
1210
use crate::rt::Executor;
13-
#[cfg(all(feature = "server", any(feature = "http1", feature = "http2")))]
14-
use crate::server::server::{new_svc::NewSvcTask, Watcher};
15-
#[cfg(all(feature = "server", any(feature = "http1", feature = "http2")))]
16-
use crate::service::HttpService;
1711

1812
#[cfg(feature = "server")]
1913
pub trait ConnStreamExec<F, B: HttpBody>: Clone {
2014
fn execute_h2stream(&mut self, fut: H2Stream<F, B>);
2115
}
2216

23-
#[cfg(all(feature = "server", any(feature = "http1", feature = "http2")))]
24-
pub trait NewSvcExec<I, N, S: HttpService<Body>, E, W: Watcher<I, S, E>>: Clone {
25-
fn execute_new_svc(&mut self, fut: NewSvcTask<I, N, S, E, W>);
26-
}
27-
2817
pub(crate) type BoxSendFuture = Pin<Box<dyn Future<Output = ()> + Send>>;
2918

3019
// Either the user provides an executor for background tasks, or we use
@@ -78,18 +67,6 @@ where
7867
}
7968
}
8069

81-
#[cfg(all(feature = "server", any(feature = "http1", feature = "http2")))]
82-
impl<I, N, S, E, W> NewSvcExec<I, N, S, E, W> for Exec
83-
where
84-
NewSvcTask<I, N, S, E, W>: Future<Output = ()> + Send + 'static,
85-
S: HttpService<Body>,
86-
W: Watcher<I, S, E>,
87-
{
88-
fn execute_new_svc(&mut self, fut: NewSvcTask<I, N, S, E, W>) {
89-
self.execute(fut)
90-
}
91-
}
92-
9370
// ==== impl Executor =====
9471

9572
#[cfg(feature = "server")]
@@ -104,19 +81,6 @@ where
10481
}
10582
}
10683

107-
#[cfg(all(feature = "server", any(feature = "http1", feature = "http2")))]
108-
impl<I, N, S, E, W> NewSvcExec<I, N, S, E, W> for E
109-
where
110-
E: Executor<NewSvcTask<I, N, S, E, W>> + Clone,
111-
NewSvcTask<I, N, S, E, W>: Future<Output = ()>,
112-
S: HttpService<Body>,
113-
W: Watcher<I, S, E>,
114-
{
115-
fn execute_new_svc(&mut self, fut: NewSvcTask<I, N, S, E, W>) {
116-
self.execute(fut)
117-
}
118-
}
119-
12084
// If http2 is not enable, we just have a stub here, so that the trait bounds
12185
// that *would* have been needed are still checked. Why?
12286
//

‎src/common/mod.rs

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ macro_rules! ready {
1010
pub(crate) mod buf;
1111
#[cfg(all(feature = "server", any(feature = "http1", feature = "http2")))]
1212
pub(crate) mod date;
13-
#[cfg(all(feature = "server", any(feature = "http1", feature = "http2")))]
14-
pub(crate) mod drain;
1513
#[cfg(any(feature = "http1", feature = "http2", feature = "server"))]
1614
pub(crate) mod exec;
1715
pub(crate) mod io;

‎src/error.rs

-26
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ pub(super) enum Kind {
4040
/// Error creating a TcpListener.
4141
#[cfg(all(feature = "tcp", feature = "server"))]
4242
Listen,
43-
/// Error accepting on an Incoming stream.
44-
#[cfg(any(feature = "http1", feature = "http2"))]
45-
#[cfg(feature = "server")]
46-
Accept,
4743
/// User took too long to send headers
4844
#[cfg(all(feature = "http1", feature = "server", feature = "runtime"))]
4945
HeaderTimeout,
@@ -96,10 +92,6 @@ pub(super) enum User {
9692
Body,
9793
/// The user aborted writing of the outgoing body.
9894
BodyWriteAborted,
99-
/// Error calling user's MakeService.
100-
#[cfg(any(feature = "http1", feature = "http2"))]
101-
#[cfg(feature = "server")]
102-
MakeService,
10395
/// Error from future of user's Service.
10496
#[cfg(any(feature = "http1", feature = "http2"))]
10597
Service,
@@ -278,12 +270,6 @@ impl Error {
278270
Error::new(Kind::Listen).with(cause)
279271
}
280272

281-
#[cfg(any(feature = "http1", feature = "http2"))]
282-
#[cfg(feature = "server")]
283-
pub(super) fn new_accept<E: Into<Cause>>(cause: E) -> Error {
284-
Error::new(Kind::Accept).with(cause)
285-
}
286-
287273
#[cfg(any(feature = "http1", feature = "http2"))]
288274
#[cfg(feature = "client")]
289275
pub(super) fn new_connect<E: Into<Cause>>(cause: E) -> Error {
@@ -356,12 +342,6 @@ impl Error {
356342
Error::new_user(User::ManualUpgrade)
357343
}
358344

359-
#[cfg(any(feature = "http1", feature = "http2"))]
360-
#[cfg(feature = "server")]
361-
pub(super) fn new_user_make_service<E: Into<Cause>>(cause: E) -> Error {
362-
Error::new_user(User::MakeService).with(cause)
363-
}
364-
365345
#[cfg(any(feature = "http1", feature = "http2"))]
366346
pub(super) fn new_user_service<E: Into<Cause>>(cause: E) -> Error {
367347
Error::new_user(User::Service).with(cause)
@@ -435,9 +415,6 @@ impl Error {
435415
Kind::Canceled => "operation was canceled",
436416
#[cfg(all(feature = "server", feature = "tcp"))]
437417
Kind::Listen => "error creating server listener",
438-
#[cfg(any(feature = "http1", feature = "http2"))]
439-
#[cfg(feature = "server")]
440-
Kind::Accept => "error accepting connection",
441418
#[cfg(all(feature = "http1", feature = "server", feature = "runtime"))]
442419
Kind::HeaderTimeout => "read header from client timeout",
443420
#[cfg(any(feature = "http1", feature = "http2"))]
@@ -455,9 +432,6 @@ impl Error {
455432
Kind::User(User::Body) => "error from user's HttpBody stream",
456433
Kind::User(User::BodyWriteAborted) => "user body write aborted",
457434
#[cfg(any(feature = "http1", feature = "http2"))]
458-
#[cfg(feature = "server")]
459-
Kind::User(User::MakeService) => "error from user's MakeService",
460-
#[cfg(any(feature = "http1", feature = "http2"))]
461435
Kind::User(User::Service) => "error from user's Service",
462436
#[cfg(any(feature = "http1", feature = "http2"))]
463437
#[cfg(feature = "server")]

‎src/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,4 @@ cfg_feature! {
102102
#![feature = "server"]
103103

104104
pub mod server;
105-
#[doc(no_inline)]
106-
pub use crate::server::Server;
107105
}

‎src/server/accept.rs

-71
This file was deleted.

‎src/server/conn.rs

-7
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
//! are not handled at this level. This module provides the building blocks to
66
//! customize those things externally.
77
//!
8-
//! If you don't have need to manage connections yourself, consider using the
9-
//! higher-level [Server](super) API.
10-
//!
118
//! ## Example
129
//! A simple example that uses the `Http` struct to talk HTTP over a Tokio TCP stream
1310
//! ```no_run
@@ -69,7 +66,6 @@ cfg_feature! {
6966
use tokio::io::{AsyncRead, AsyncWrite};
7067
use tracing::trace;
7168

72-
pub use super::server::Connecting;
7369
use crate::body::{Body, HttpBody};
7470
use crate::common::{task, Future, Pin, Poll, Unpin};
7571
#[cfg(not(all(feature = "http1", feature = "http2")))]
@@ -84,9 +80,6 @@ cfg_feature! {
8480
/// A lower-level configuration of the HTTP protocol.
8581
///
8682
/// This structure is used to configure options for an HTTP server connection.
87-
///
88-
/// If you don't have need to manage connections yourself, consider using the
89-
/// higher-level [Server](super) API.
9083
#[derive(Clone, Debug)]
9184
#[cfg(any(feature = "http1", feature = "http2"))]
9285
#[cfg_attr(docsrs, doc(cfg(any(feature = "http1", feature = "http2"))))]

‎src/server/mod.rs

+5-32
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,10 @@
11
//! HTTP Server
22
//!
3-
//! A `Server` is created to listen on a port, parse HTTP requests, and hand
4-
//! them off to a `Service`.
3+
//! A "server" is usually created by listening on a port for new connections,
4+
//! parse HTTP requests, and hand them off to a `Service`.
55
//!
6-
//! There are two levels of APIs provide for constructing HTTP servers:
7-
//!
8-
//! - The higher-level [`Server`](Server) type.
9-
//! - The lower-level [`conn`](conn) module.
10-
//!
11-
//! # Server
12-
//!
13-
//! The [`Server`](Server) is main way to start listening for HTTP requests.
14-
//! It wraps a listener with a [`MakeService`](crate::service), and then should
15-
//! be executed to start serving requests.
16-
//!
17-
//! [`Server`](Server) accepts connections in both HTTP1 and HTTP2 by default.
18-
pub mod accept;
6+
//! How exactly you choose to listen for connections is not something hyper
7+
//! concerns itself with. After you have a connection, you can handle HTTP over
8+
//! it with the types in the [`conn`](conn) module.
199
pub mod conn;
2010

21-
pub use self::server::Server;
22-
23-
cfg_feature! {
24-
#![any(feature = "http1", feature = "http2")]
25-
26-
pub(crate) mod server;
27-
pub use self::server::Builder;
28-
29-
mod shutdown;
30-
}
31-
32-
cfg_feature! {
33-
#![not(any(feature = "http1", feature = "http2"))]
34-
35-
mod server_stub;
36-
use server_stub as server;
37-
}

‎src/server/server.rs

-622
This file was deleted.

‎src/server/server_stub.rs

-16
This file was deleted.

‎src/server/shutdown.rs

-128
This file was deleted.

‎src/service/make.rs

+1-114
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
use std::error::Error as StdError;
2-
use std::fmt;
3-
41
use tokio::io::{AsyncRead, AsyncWrite};
52

6-
use super::{HttpService, Service};
7-
use crate::body::HttpBody;
3+
use super::Service;
84
use crate::common::{task, Future, Poll};
95

106
// The same "trait alias" as tower::MakeConnection, but inlined to reduce
@@ -38,115 +34,6 @@ where
3834
}
3935
}
4036

41-
// Just a sort-of "trait alias" of `MakeService`, not to be implemented
42-
// by anyone, only used as bounds.
43-
pub trait MakeServiceRef<Target, ReqBody>: self::sealed::Sealed<(Target, ReqBody)> {
44-
type ResBody: HttpBody;
45-
type Error: Into<Box<dyn StdError + Send + Sync>>;
46-
type Service: HttpService<ReqBody, ResBody = Self::ResBody, Error = Self::Error>;
47-
type MakeError: Into<Box<dyn StdError + Send + Sync>>;
48-
type Future: Future<Output = Result<Self::Service, Self::MakeError>>;
49-
50-
// Acting like a #[non_exhaustive] for associated types of this trait.
51-
//
52-
// Basically, no one outside of hyper should be able to set this type
53-
// or declare bounds on it, so it should prevent people from creating
54-
// trait objects or otherwise writing code that requires using *all*
55-
// of the associated types.
56-
//
57-
// Why? So we can add new associated types to this alias in the future,
58-
// if necessary.
59-
type __DontNameMe: self::sealed::CantImpl;
60-
61-
fn poll_ready_ref(&mut self, cx: &mut task::Context<'_>) -> Poll<Result<(), Self::MakeError>>;
62-
63-
fn make_service_ref(&mut self, target: &Target) -> Self::Future;
64-
}
65-
66-
impl<T, Target, E, ME, S, F, IB, OB> MakeServiceRef<Target, IB> for T
67-
where
68-
T: for<'a> Service<&'a Target, Error = ME, Response = S, Future = F>,
69-
E: Into<Box<dyn StdError + Send + Sync>>,
70-
ME: Into<Box<dyn StdError + Send + Sync>>,
71-
S: HttpService<IB, ResBody = OB, Error = E>,
72-
F: Future<Output = Result<S, ME>>,
73-
IB: HttpBody,
74-
OB: HttpBody,
75-
{
76-
type Error = E;
77-
type Service = S;
78-
type ResBody = OB;
79-
type MakeError = ME;
80-
type Future = F;
81-
82-
type __DontNameMe = self::sealed::CantName;
83-
84-
fn poll_ready_ref(&mut self, cx: &mut task::Context<'_>) -> Poll<Result<(), Self::MakeError>> {
85-
self.poll_ready(cx)
86-
}
87-
88-
fn make_service_ref(&mut self, target: &Target) -> Self::Future {
89-
self.call(target)
90-
}
91-
}
92-
93-
impl<T, Target, S, B1, B2> self::sealed::Sealed<(Target, B1)> for T
94-
where
95-
T: for<'a> Service<&'a Target, Response = S>,
96-
S: HttpService<B1, ResBody = B2>,
97-
B1: HttpBody,
98-
B2: HttpBody,
99-
{
100-
}
101-
102-
/// Create a `MakeService` from a function.
103-
pub fn make_service_fn<F, Target, Ret>(f: F) -> MakeServiceFn<F>
104-
where
105-
F: FnMut(&Target) -> Ret,
106-
Ret: Future,
107-
{
108-
MakeServiceFn { f }
109-
}
110-
111-
/// `MakeService` returned from [`make_service_fn`]
112-
#[derive(Clone, Copy)]
113-
pub struct MakeServiceFn<F> {
114-
f: F,
115-
}
116-
117-
impl<'t, F, Ret, Target, Svc, MkErr> Service<&'t Target> for MakeServiceFn<F>
118-
where
119-
F: FnMut(&Target) -> Ret,
120-
Ret: Future<Output = Result<Svc, MkErr>>,
121-
MkErr: Into<Box<dyn StdError + Send + Sync>>,
122-
{
123-
type Error = MkErr;
124-
type Response = Svc;
125-
type Future = Ret;
126-
127-
fn poll_ready(&mut self, _cx: &mut task::Context<'_>) -> Poll<Result<(), Self::Error>> {
128-
Poll::Ready(Ok(()))
129-
}
130-
131-
fn call(&mut self, target: &'t Target) -> Self::Future {
132-
(self.f)(target)
133-
}
134-
}
135-
136-
impl<F> fmt::Debug for MakeServiceFn<F> {
137-
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
138-
f.debug_struct("MakeServiceFn").finish()
139-
}
140-
}
141-
14237
mod sealed {
14338
pub trait Sealed<X> {}
144-
145-
#[allow(unreachable_pub)] // This is intentional.
146-
pub trait CantImpl {}
147-
148-
#[allow(missing_debug_implementations)]
149-
pub enum CantName {}
150-
151-
impl CantImpl for CantName {}
15239
}

‎src/service/mod.rs

+1-15
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
//!
1111
//! - `HttpService`: This is blanketly implemented for all types that
1212
//! implement `Service<http::Request<B1>, Response = http::Response<B2>>`.
13-
//! - `MakeService`: When a `Service` returns a new `Service` as its "response",
14-
//! we consider it a `MakeService`. Again, blanketly implemented in those cases.
1513
//! - `MakeConnection`: A `Service` that returns a "connection", a type that
1614
//! implements `AsyncRead` and `AsyncWrite`.
1715
//!
@@ -24,16 +22,6 @@
2422
//! The helper [`service_fn`](service_fn) should be sufficient for most cases, but
2523
//! if you need to implement `Service` for a type manually, you can follow the example
2624
//! in `service_struct_impl.rs`.
27-
//!
28-
//! # MakeService
29-
//!
30-
//! Since a `Service` is bound to a single connection, a [`Server`](crate::Server)
31-
//! needs a way to make them as it accepts connections. This is what a
32-
//! `MakeService` does.
33-
//!
34-
//! Resources that need to be shared by all `Service`s can be put into a
35-
//! `MakeService`, and then passed to individual `Service`s when `call`
36-
//! is called.
3725
3826
pub use tower_service::Service;
3927

@@ -43,13 +31,11 @@ mod make;
4331
mod oneshot;
4432
mod util;
4533

34+
#[cfg(all(any(feature = "http1", feature = "http2"), feature = "server"))]
4635
pub(super) use self::http::HttpService;
4736
#[cfg(all(any(feature = "http1", feature = "http2"), feature = "client"))]
4837
pub(super) use self::make::MakeConnection;
49-
#[cfg(all(any(feature = "http1", feature = "http2"), feature = "server"))]
50-
pub(super) use self::make::MakeServiceRef;
5138
#[cfg(all(any(feature = "http1", feature = "http2"), feature = "client"))]
5239
pub(super) use self::oneshot::{oneshot, Oneshot};
5340

54-
pub use self::make::make_service_fn;
5541
pub use self::util::service_fn;

0 commit comments

Comments
 (0)
Please sign in to comment.