forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(server): remove more 'static bounds on Server

Browse Source
This commit is contained in:
Sean McArthur
2019-10-24 13:18:07 -07:00
parent 8b878a805a
commit b5e70a0dd1
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/conn.rs
View File

@@ -902,7 +902,7 @@ pub(crate) mod spawn_all {
impl<I, S, E> Watcher<I, S, E> for NoopWatcher impl<I, S, E> Watcher<I, S, E> for NoopWatcher
where where
I: AsyncRead + AsyncWrite + Unpin + Send + 'static, I: AsyncRead + AsyncWrite + Unpin + Send + 'static,
S: HttpService<Body> + 'static, S: HttpService<Body>,
<S::ResBody as Payload>::Data: Unpin, <S::ResBody as Payload>::Data: Unpin,
E: H2Exec<S::Future, S::ResBody>, E: H2Exec<S::Future, S::ResBody>,
{ {
@@ -1017,7 +1017,7 @@ mod upgrades {
impl<I, B, S, E> UpgradeableConnection<I, S, E> impl<I, B, S, E> UpgradeableConnection<I, S, E>
where where
S: HttpService<Body, ResBody=B>,// + 'static, S: HttpService<Body, ResBody=B>,
S::Error: Into<Box<dyn StdError + Send + Sync>>, S::Error: Into<Box<dyn StdError + Send + Sync>>,
I: AsyncRead + AsyncWrite + Unpin, I: AsyncRead + AsyncWrite + Unpin,
B: Payload + 'static, B: Payload + 'static,
@@ -1035,7 +1035,7 @@ mod upgrades {
impl<I, B, S, E> Future for UpgradeableConnection<I, S, E> impl<I, B, S, E> Future for UpgradeableConnection<I, S, E>
where where
S: HttpService<Body, ResBody=B> + 'static, S: HttpService<Body, ResBody=B>,
S::Error: Into<Box<dyn StdError + Send + Sync>>, S::Error: Into<Box<dyn StdError + Send + Sync>>,
I: AsyncRead + AsyncWrite + Unpin + Send + 'static, I: AsyncRead + AsyncWrite + Unpin + Send + 'static,
B: Payload + 'static, B: Payload + 'static,

3
src/server/mod.rs
View File

@@ -149,7 +149,6 @@ where
IO: AsyncRead + AsyncWrite + Unpin + Send + 'static, IO: AsyncRead + AsyncWrite + Unpin + Send + 'static,
S: MakeServiceRef<IO, Body, ResBody=B>, S: MakeServiceRef<IO, Body, ResBody=B>,
S::Error: Into<Box<dyn StdError + Send + Sync>>, S::Error: Into<Box<dyn StdError + Send + Sync>>,
S::Service: 'static,
B: Payload, B: Payload,
B::Data: Unpin, B::Data: Unpin,
E: H2Exec<<S::Service as HttpService<Body>>::Future, B>, E: H2Exec<<S::Service as HttpService<Body>>::Future, B>,
@@ -206,7 +205,6 @@ where
IO: AsyncRead + AsyncWrite + Unpin + Send + 'static, IO: AsyncRead + AsyncWrite + Unpin + Send + 'static,
S: MakeServiceRef<IO, Body, ResBody=B>, S: MakeServiceRef<IO, Body, ResBody=B>,
S::Error: Into<Box<dyn StdError + Send + Sync>>, S::Error: Into<Box<dyn StdError + Send + Sync>>,
S::Service: 'static,
B: Payload, B: Payload,
B::Data: Unpin, B::Data: Unpin,
E: H2Exec<<S::Service as HttpService<Body>>::Future, B>, E: H2Exec<<S::Service as HttpService<Body>>::Future, B>,
@@ -392,7 +390,6 @@ impl<I, E> Builder<I, E> {
I::Conn: AsyncRead + AsyncWrite + Unpin + Send + 'static, I::Conn: AsyncRead + AsyncWrite + Unpin + Send + 'static,
S: MakeServiceRef<I::Conn, Body, ResBody=B>, S: MakeServiceRef<I::Conn, Body, ResBody=B>,
S::Error: Into<Box<dyn StdError + Send + Sync>>, S::Error: Into<Box<dyn StdError + Send + Sync>>,
S::Service: 'static,
B: Payload, B: Payload,
B::Data: Unpin, B::Data: Unpin,
E: NewSvcExec<I::Conn, S::Future, S::Service, E, NoopWatcher>, E: NewSvcExec<I::Conn, S::Future, S::Service, E, NoopWatcher>,

3
src/server/shutdown.rs
View File

@@ -50,7 +50,6 @@ where
IE: Into<Box<dyn StdError + Send + Sync>>, IE: Into<Box<dyn StdError + Send + Sync>>,
IO: AsyncRead + AsyncWrite + Unpin + Send + 'static, IO: AsyncRead + AsyncWrite + Unpin + Send + 'static,
S: MakeServiceRef<IO, Body, ResBody=B>, S: MakeServiceRef<IO, Body, ResBody=B>,
S::Service: 'static,
S::Error: Into<Box<dyn StdError + Send + Sync>>, S::Error: Into<Box<dyn StdError + Send + Sync>>,
B: Payload, B: Payload,
B::Data: Unpin, B::Data: Unpin,
@@ -106,7 +105,7 @@ pub struct GracefulWatcher(Watch);
impl<I, S, E> Watcher<I, S, E> for GracefulWatcher impl<I, S, E> Watcher<I, S, E> for GracefulWatcher
where where
I: AsyncRead + AsyncWrite + Unpin + Send + 'static, I: AsyncRead + AsyncWrite + Unpin + Send + 'static,
S: HttpService<Body> + 'static, S: HttpService<Body>,
<S::ResBody as Payload>::Data: Unpin, <S::ResBody as Payload>::Data: Unpin,
E: H2Exec<S::Future, S::ResBody>, E: H2Exec<S::Future, S::ResBody>,
{ {