actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2025-08-19 10:45:35 +02:00
Code Issues Releases Wiki Activity

convert to edition 2018

Browse Source
This commit is contained in:
Nikolay Kim
2018-12-06 14:04:42 -08:00
parent 42a4679635
commit 8fe7ce533c
21 changed files with 103 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/framed.rs
View File

@@ -9,8 +9,8 @@ use futures::{Async, AsyncSink, Future, Poll, Sink, Stream};
use tokio_codec::{Decoder, Encoder};
use tokio_io::{AsyncRead, AsyncWrite};
use codec::Framed;
use service::{IntoNewService, IntoService, NewService, Service};
use crate::codec::Framed;
use crate::service::{IntoNewService, IntoService, NewService, Service};
type Request<U> = <U as Decoder>::Item;
type Response<U> = <U as Encoder>::Item;
@@ -300,10 +300,10 @@ where
}
}
}
Ok(Async::NotReady) => return false,
Ok(Async::NotReady) => false,
Err(err) => {
self.state = TransportState::Error(FramedTransportError::Service(err));
return true;
true
}
}
}
@@ -387,26 +387,22 @@ where
fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
match mem::replace(&mut self.state, TransportState::Processing) {
TransportState::Processing => {
if self.poll_service() {
return self.poll();
if self.poll_service() || self.poll_response() {
self.poll()
} else {
Ok(Async::NotReady)
}
if self.poll_response() {
return self.poll();
}
return Ok(Async::NotReady);
}
TransportState::Error(err) => {
if self.poll_response() {
return Err(err);
if self.poll_response() || self.flushed {
Err(err)
} else {
self.state = TransportState::Error(err);
Ok(Async::NotReady)
}
if self.flushed {
return Err(err);
}
self.state = TransportState::Error(err);
return Ok(Async::NotReady);
}
TransportState::EncoderError(err) => return Err(err),
TransportState::Stopping => return Ok(Async::Ready(())),
TransportState::EncoderError(err) => Err(err),
TransportState::Stopping => Ok(Async::Ready(())),
}
}
}