From 82b71d91ea5d00fdee0431c2c8dc94e501d87920 Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Tue, 11 Sep 2018 09:30:22 -0700 Subject: [PATCH] move Service to service sub mod --- src/connector.rs | 2 +- src/lib.rs | 5 ----- src/resolver.rs | 2 +- src/server/mod.rs | 1 + src/server/services.rs | 2 +- src/service/and_then.rs | 3 +-- src/service/apply.rs | 3 ++- src/service/fn_service.rs | 3 +-- src/service/fn_state_service.rs | 3 +-- src/service/from_err.rs | 3 ++- src/service/map.rs | 3 ++- src/service/map_err.rs | 3 ++- src/service/map_init_err.rs | 3 ++- src/service/mod.rs | 4 +++- src/ssl/openssl.rs | 2 +- src/stream.rs | 2 +- 16 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/connector.rs b/src/connector.rs index 66fc065a..b2bf235f 100644 --- a/src/connector.rs +++ b/src/connector.rs @@ -11,7 +11,7 @@ use trust_dns_resolver::config::{ResolverConfig, ResolverOpts}; use trust_dns_resolver::system_conf::read_system_conf; use super::resolver::{HostAware, Resolver, ResolverError, ResolverFuture}; -use super::{NewService, Service}; +use super::service::{NewService, Service}; // #[derive(Fail, Debug)] #[derive(Debug)] diff --git a/src/lib.rs b/src/lib.rs index 2666e252..fe27daae 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -57,14 +57,9 @@ extern crate webpki; #[cfg(feature = "rust-tls")] extern crate webpki_roots; -/// re-export for convinience -pub use tower_service::{NewService, Service}; - pub mod connector; pub mod resolver; pub mod server; pub mod service; pub mod ssl; pub mod stream; - -pub use service::{IntoNewService, IntoService, NewServiceExt, ServiceExt}; diff --git a/src/resolver.rs b/src/resolver.rs index 0ad3c686..4606b1e5 100644 --- a/src/resolver.rs +++ b/src/resolver.rs @@ -11,7 +11,7 @@ use trust_dns_resolver::lookup_ip::LookupIpFuture; use trust_dns_resolver::system_conf::read_system_conf; use trust_dns_resolver::{AsyncResolver, Background}; -use super::Service; +use super::service::Service; #[derive(Debug)] pub enum ResolverError { diff --git a/src/server/mod.rs b/src/server/mod.rs index 44923cd4..fb65b430 100644 --- a/src/server/mod.rs +++ b/src/server/mod.rs @@ -10,6 +10,7 @@ mod worker; pub use self::server::Server; pub use self::services::ServerServiceFactory; +#[allow(unused_imports)] pub(crate) use self::worker::{Connections, ConnectionsGuard}; /// Pause accepting incoming connections diff --git a/src/server/services.rs b/src/server/services.rs index b83459d4..459a3447 100644 --- a/src/server/services.rs +++ b/src/server/services.rs @@ -5,7 +5,7 @@ use futures::{Future, Poll}; use tokio_reactor::Handle; use tokio_tcp::TcpStream; -use {NewService, Service}; +use service::{NewService, Service}; pub enum ServerMessage { Connect(net::TcpStream), diff --git a/src/service/and_then.rs b/src/service/and_then.rs index 922e10ed..8315e52d 100644 --- a/src/service/and_then.rs +++ b/src/service/and_then.rs @@ -2,9 +2,8 @@ use std::cell::RefCell; use std::rc::Rc; use futures::{Async, Future, Poll}; -use tower_service::{NewService, Service}; -use super::IntoNewService; +use super::{IntoNewService, NewService, Service}; /// `AndThen` service combinator pub struct AndThen { diff --git a/src/service/apply.rs b/src/service/apply.rs index d98e77c8..e0adf0a0 100644 --- a/src/service/apply.rs +++ b/src/service/apply.rs @@ -1,7 +1,8 @@ use std::marker::PhantomData; use futures::{Async, Future, IntoFuture, Poll}; -use {IntoNewService, NewService, Service}; + +use super::{IntoNewService, NewService, Service}; /// `Apply` service combinator pub struct Apply { diff --git a/src/service/fn_service.rs b/src/service/fn_service.rs index cf3d6d85..7a4e2284 100644 --- a/src/service/fn_service.rs +++ b/src/service/fn_service.rs @@ -4,9 +4,8 @@ use futures::{ future::{ok, FutureResult}, Async, IntoFuture, Poll, }; -use tower_service::{NewService, Service}; -use super::{IntoNewService, IntoService}; +use super::{IntoNewService, IntoService, NewService, Service}; pub struct FnService where diff --git a/src/service/fn_state_service.rs b/src/service/fn_state_service.rs index 2366baa2..70f8e205 100644 --- a/src/service/fn_state_service.rs +++ b/src/service/fn_state_service.rs @@ -1,9 +1,8 @@ use std::marker; use futures::{Async, Future, IntoFuture, Poll}; -use tower_service::{NewService, Service}; -use super::IntoNewService; +use super::{IntoNewService, NewService, Service}; pub struct FnStateService where diff --git a/src/service/from_err.rs b/src/service/from_err.rs index ef5619db..3015cd00 100644 --- a/src/service/from_err.rs +++ b/src/service/from_err.rs @@ -1,7 +1,8 @@ use std::marker::PhantomData; use futures::{Future, Poll}; -use tower_service::Service; + +use super::Service; pub struct FromErr where diff --git a/src/service/map.rs b/src/service/map.rs index 9fa2acf6..373205a9 100644 --- a/src/service/map.rs +++ b/src/service/map.rs @@ -1,7 +1,8 @@ use std::marker; use futures::{Async, Future, Poll}; -use {NewService, Service}; + +use super::{NewService, Service}; /// `Map` service combinator pub struct Map { diff --git a/src/service/map_err.rs b/src/service/map_err.rs index b05b635a..db0ed588 100644 --- a/src/service/map_err.rs +++ b/src/service/map_err.rs @@ -1,7 +1,8 @@ use std::marker; use futures::{Async, Future, Poll}; -use tower_service::{NewService, Service}; + +use super::{NewService, Service}; /// `MapErr` service combinator pub struct MapErr { diff --git a/src/service/map_init_err.rs b/src/service/map_init_err.rs index 1b5d1e1c..e6129d29 100644 --- a/src/service/map_init_err.rs +++ b/src/service/map_init_err.rs @@ -1,7 +1,8 @@ use std::marker; use futures::{Future, Poll}; -use tower_service::NewService; + +use super::NewService; /// `MapInitErr` service combinator pub struct MapInitErr { diff --git a/src/service/mod.rs b/src/service/mod.rs index 31d1aec4..5ab16180 100644 --- a/src/service/mod.rs +++ b/src/service/mod.rs @@ -1,5 +1,8 @@ use futures::{Future, IntoFuture}; +/// re-export for convinience +pub use tower_service::{NewService, Service}; + mod and_then; mod apply; mod fn_service; @@ -17,7 +20,6 @@ pub use self::from_err::FromErr; pub use self::map::{Map, MapNewService}; pub use self::map_err::{MapErr, MapErrNewService}; pub use self::map_init_err::MapInitErr; -use {NewService, Service}; pub trait ServiceExt: Service { fn apply(self, f: F) -> Apply diff --git a/src/ssl/openssl.rs b/src/ssl/openssl.rs index 057ab845..8a84062d 100644 --- a/src/ssl/openssl.rs +++ b/src/ssl/openssl.rs @@ -8,7 +8,7 @@ use tokio_openssl::{AcceptAsync, ConnectAsync, SslAcceptorExt, SslConnectorExt, use super::MAX_CONN_COUNTER; use connector::ConnectionInfo; use server::{Connections, ConnectionsGuard}; -use {NewService, Service}; +use service::{NewService, Service}; /// Support `SSL` connections via openssl package /// diff --git a/src/stream.rs b/src/stream.rs index f0ef120e..1f03cab0 100644 --- a/src/stream.rs +++ b/src/stream.rs @@ -2,7 +2,7 @@ use futures::unsync::mpsc; use futures::{Async, Future, Poll, Stream}; use tokio::executor::current_thread::spawn; -use super::{IntoService, Service}; +use super::service::{IntoService, Service}; pub struct StreamDispatcher { stream: S,