actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2024-11-30 17:44:34 +01:00
Code Issues Releases Wiki Activity

rename FramedDispatcher to FramedTransport

Browse Source
This commit is contained in:
Nikolay Kim 2018-09-24 17:50:29 -07:00
parent 477e1d6953
commit 01bed8b2e5
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/framed.rs
View File

@ -60,7 +60,7 @@ where
<U as Encoder>::Error: fmt::Debug + 'static, <U as Encoder>::Error: fmt::Debug + 'static,
{ {
type Request = Framed<T, U>; type Request = Framed<T, U>;
type Response = FramedDispatcher<S::Service, T, U>; type Response = FramedTransport<S::Service, T, U>;
type Error = S::InitError; type Error = S::InitError;
type InitError = S::InitError; type InitError = S::InitError;
type Service = FramedService<S, T, U>; type Service = FramedService<S, T, U>;
@ -102,7 +102,7 @@ where
<U as Encoder>::Error: fmt::Debug + 'static, <U as Encoder>::Error: fmt::Debug + 'static,
{ {
type Request = Framed<T, U>; type Request = Framed<T, U>;
type Response = FramedDispatcher<S::Service, T, U>; type Response = FramedTransport<S::Service, T, U>;
type Error = S::InitError; type Error = S::InitError;
type Future = FramedServiceResponseFuture<S, T, U>; type Future = FramedServiceResponseFuture<S, T, U>;
@ -143,13 +143,13 @@ where
<U as Encoder>::Item: fmt::Debug + 'static, <U as Encoder>::Item: fmt::Debug + 'static,
<U as Encoder>::Error: fmt::Debug + 'static, <U as Encoder>::Error: fmt::Debug + 'static,
{ {
type Item = FramedDispatcher<S::Service, T, U>; type Item = FramedTransport<S::Service, T, U>;
type Error = S::InitError; type Error = S::InitError;
fn poll(&mut self) -> Poll<Self::Item, Self::Error> { fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
match self.fut.poll()? { match self.fut.poll()? {
Async::NotReady => Ok(Async::NotReady), Async::NotReady => Ok(Async::NotReady),
Async::Ready(service) => Ok(Async::Ready(FramedDispatcher::new( Async::Ready(service) => Ok(Async::Ready(FramedTransport::new(
self.framed.take().unwrap(), self.framed.take().unwrap(),
service, service,
))), ))),
@ -157,9 +157,9 @@ where
} }
} }
/// FramedDispatcher - is a future that reads frames from Framed object /// FramedTransport - is a future that reads frames from Framed object
/// and pass then to the service. /// and pass then to the service.
pub struct FramedDispatcher<S, T, U> pub struct FramedTransport<S, T, U>
where where
S: Service, S: Service,
T: AsyncRead + AsyncWrite, T: AsyncRead + AsyncWrite,
@ -174,7 +174,7 @@ where
flushed: bool, flushed: bool,
} }
impl<S, T, U> FramedDispatcher<S, T, U> impl<S, T, U> FramedTransport<S, T, U>
where where
T: AsyncRead + AsyncWrite, T: AsyncRead + AsyncWrite,
U: Decoder + Encoder, U: Decoder + Encoder,
@ -186,7 +186,7 @@ where
{ {
pub fn new<F: IntoService<S>>(framed: Framed<T, U>, service: F) -> Self { pub fn new<F: IntoService<S>>(framed: Framed<T, U>, service: F) -> Self {
let (write_tx, write_rx) = mpsc::channel(16); let (write_tx, write_rx) = mpsc::channel(16);
FramedDispatcher { FramedTransport {
framed, framed,
item: None, item: None,
service: service.into_service(), service: service.into_service(),
@ -198,7 +198,7 @@ where
} }
} }
impl<S, T, U> Future for FramedDispatcher<S, T, U> impl<S, T, U> Future for FramedTransport<S, T, U>
where where
T: AsyncRead + AsyncWrite, T: AsyncRead + AsyncWrite,
U: Decoder + Encoder, U: Decoder + Encoder,