talksik/tonic
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fmt

Browse Source
This commit is contained in:
Lucio Franco
2019-09-19 08:31:44 -06:00
parent e419c18304
commit 768f4afdff
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tonic/src/transport/server.rs
+10 -9
View File
@@ -1,5 +1,5 @@
use super::{ use super::{
service::{BoxedIo, layer_fn}, service::{layer_fn, BoxedIo},
tls::{Cert, TlsAcceptor}, tls::{Cert, TlsAcceptor},
}; };
use crate::BoxBody; use crate::BoxBody;
@@ -10,17 +10,17 @@ use hyper::server::{accept::Accept, conn};
use hyper::Body; use hyper::Body;
use std::sync::Arc; use std::sync::Arc;
use std::{ use std::{
fmt,
future::Future,
net::SocketAddr, net::SocketAddr,
pin::Pin, pin::Pin,
task::{Context, Poll}, task::{Context, Poll},
fmt,
future::Future
}; };
use tower::layer::util::Stack;
use tower::layer::Layer; use tower::layer::Layer;
use tower::util::Either;
use tower_make::MakeService; use tower_make::MakeService;
use tower_service::Service; use tower_service::Service;
use tower::layer::util::Stack;
use tower::util::Either;
type BoxService = tower::util::BoxService<Request<Body>, Response<BoxBody>, crate::Error>; type BoxService = tower::util::BoxService<Request<Body>, Response<BoxBody>, crate::Error>;
type Interceptor = Arc<dyn Layer<BoxService, Service = BoxService> + Send + Sync + 'static>; type Interceptor = Arc<dyn Layer<BoxService, Service = BoxService> + Send + Sync + 'static>;
@@ -55,8 +55,8 @@ impl Builder {
pub fn interceptor_fn<F, Out>(&mut self, f: F) -> &mut Self pub fn interceptor_fn<F, Out>(&mut self, f: F) -> &mut Self
where where
F: Fn(&mut BoxService, Request<Body>) -> Out + Send + Sync + 'static, F: Fn(&mut BoxService, Request<Body>) -> Out + Send + Sync + 'static,
Out: Future<Output = Result<Response<BoxBody>, crate::Error>> + Send + 'static Out: Future<Output = Result<Response<BoxBody>, crate::Error>> + Send + 'static,
{ {
let f = Arc::new(f); let f = Arc::new(f);
let interceptor = layer_fn(move |mut s| { let interceptor = layer_fn(move |mut s| {
@@ -162,7 +162,7 @@ struct Svc<S>(S);
impl<S> Service<Request<Body>> for Svc<S> impl<S> Service<Request<Body>> for Svc<S>
where where
S: Service<Request<Body>, Response = Response<BoxBody>>, S: Service<Request<Body>, Response = Response<BoxBody>>,
S::Error: Into<crate::Error> S::Error: Into<crate::Error>,
{ {
type Response = Response<BoxBody>; type Response = Response<BoxBody>;
type Error = crate::Error; type Error = crate::Error;
@@ -193,7 +193,8 @@ where
{ {
type Response = Either<Svc<S>, BoxService>; type Response = Either<Svc<S>, BoxService>;
type Error = crate::Error; type Error = crate::Error;
type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send + 'static>>; type Future =
Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send + 'static>>;
fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> { fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
MakeService::poll_ready(&mut self.inner, cx).map_err(Into::into) MakeService::poll_ready(&mut self.inner, cx).map_err(Into::into)