From 768f4afdff92c4fb0f951dc0c88ef32da8784952 Mon Sep 17 00:00:00 2001 From: Lucio Franco Date: Thu, 19 Sep 2019 08:31:44 -0600 Subject: [PATCH] fmt --- tonic/src/transport/server.rs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tonic/src/transport/server.rs b/tonic/src/transport/server.rs index 36e3995..a4fe504 100644 --- a/tonic/src/transport/server.rs +++ b/tonic/src/transport/server.rs @@ -1,5 +1,5 @@ use super::{ - service::{BoxedIo, layer_fn}, + service::{layer_fn, BoxedIo}, tls::{Cert, TlsAcceptor}, }; use crate::BoxBody; @@ -10,17 +10,17 @@ use hyper::server::{accept::Accept, conn}; use hyper::Body; use std::sync::Arc; use std::{ + fmt, + future::Future, net::SocketAddr, pin::Pin, task::{Context, Poll}, - fmt, - future::Future }; +use tower::layer::util::Stack; use tower::layer::Layer; +use tower::util::Either; use tower_make::MakeService; use tower_service::Service; -use tower::layer::util::Stack; -use tower::util::Either; type BoxService = tower::util::BoxService, Response, crate::Error>; type Interceptor = Arc + Send + Sync + 'static>; @@ -55,8 +55,8 @@ impl Builder { pub fn interceptor_fn(&mut self, f: F) -> &mut Self where - F: Fn(&mut BoxService, Request) -> Out + Send + Sync + 'static, - Out: Future, crate::Error>> + Send + 'static + F: Fn(&mut BoxService, Request) -> Out + Send + Sync + 'static, + Out: Future, crate::Error>> + Send + 'static, { let f = Arc::new(f); let interceptor = layer_fn(move |mut s| { @@ -162,7 +162,7 @@ struct Svc(S); impl Service> for Svc where S: Service, Response = Response>, - S::Error: Into + S::Error: Into, { type Response = Response; type Error = crate::Error; @@ -193,7 +193,8 @@ where { type Response = Either, BoxService>; type Error = crate::Error; - type Future = Pin> + Send + 'static>>; + type Future = + Pin> + Send + 'static>>; fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll> { MakeService::poll_ready(&mut self.inner, cx).map_err(Into::into)