actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2024-11-24 07:53:00 +01:00
Code Issues Releases Wiki Activity

naming

Browse Source
This commit is contained in:
Nikolay Kim 2018-03-09 05:36:40 -08:00
parent 49e007ff2a
commit 1c6ddfd34c
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/multipart.rs
View File

@ -130,7 +130,7 @@ impl<S> InnerMultipart<S> where S: Stream<Item=Bytes, Error=PayloadError> {
fn read_headers(payload: &mut PayloadHelper<S>) -> Poll<HeaderMap, MultipartError> fn read_headers(payload: &mut PayloadHelper<S>) -> Poll<HeaderMap, MultipartError>
{ {
match payload.readuntil(b"\r\n\r\n")? { match payload.read_until(b"\r\n\r\n")? {
Async::NotReady => Ok(Async::NotReady), Async::NotReady => Ok(Async::NotReady),
Async::Ready(None) => Err(MultipartError::Incomplete), Async::Ready(None) => Err(MultipartError::Incomplete),
Async::Ready(Some(bytes)) => { Async::Ready(Some(bytes)) => {
@ -469,13 +469,13 @@ impl<S> InnerField<S> where S: Stream<Item=Bytes, Error=PayloadError> {
fn read_stream(payload: &mut PayloadHelper<S>, boundary: &str) fn read_stream(payload: &mut PayloadHelper<S>, boundary: &str)
-> Poll<Option<Bytes>, MultipartError> -> Poll<Option<Bytes>, MultipartError>
{ {
match payload.readuntil(b"\r")? { match payload.read_until(b"\r")? {
Async::NotReady => Ok(Async::NotReady), Async::NotReady => Ok(Async::NotReady),
Async::Ready(None) => Err(MultipartError::Incomplete), Async::Ready(None) => Err(MultipartError::Incomplete),
Async::Ready(Some(mut chunk)) => { Async::Ready(Some(mut chunk)) => {
if chunk.len() == 1 { if chunk.len() == 1 {
payload.unread_data(chunk); payload.unread_data(chunk);
match payload.readexactly(boundary.len() + 4)? { match payload.read_exact(boundary.len() + 4)? {
Async::NotReady => Ok(Async::NotReady), Async::NotReady => Ok(Async::NotReady),
Async::Ready(None) => Err(MultipartError::Incomplete), Async::Ready(None) => Err(MultipartError::Incomplete),
Async::Ready(Some(chunk)) => { Async::Ready(Some(chunk)) => {

10
src/payload.rs
View File

@ -313,7 +313,7 @@ impl<S> PayloadHelper<S> where S: Stream<Item=Bytes, Error=PayloadError> {
} }
#[inline] #[inline]
pub fn readexactly(&mut self, size: usize) -> Poll<Option<Bytes>, PayloadError> { pub fn read_exact(&mut self, size: usize) -> Poll<Option<Bytes>, PayloadError> {
if size <= self.len { if size <= self.len {
self.len -= size; self.len -= size;
let mut chunk = self.items.pop_front().unwrap(); let mut chunk = self.items.pop_front().unwrap();
@ -341,7 +341,7 @@ impl<S> PayloadHelper<S> where S: Stream<Item=Bytes, Error=PayloadError> {
} }
} else { } else {
match self.poll_stream()? { match self.poll_stream()? {
Async::Ready(true) => self.readexactly(size), Async::Ready(true) => self.read_exact(size),
Async::Ready(false) => Ok(Async::Ready(None)), Async::Ready(false) => Ok(Async::Ready(None)),
Async::NotReady => Ok(Async::NotReady), Async::NotReady => Ok(Async::NotReady),
} }
@ -387,7 +387,7 @@ impl<S> PayloadHelper<S> where S: Stream<Item=Bytes, Error=PayloadError> {
} }
} }
pub fn readuntil(&mut self, line: &[u8]) -> Poll<Option<Bytes>, PayloadError> { pub fn read_until(&mut self, line: &[u8]) -> Poll<Option<Bytes>, PayloadError> {
let mut idx = 0; let mut idx = 0;
let mut num = 0; let mut num = 0;
let mut offset = 0; let mut offset = 0;
@ -436,14 +436,14 @@ impl<S> PayloadHelper<S> where S: Stream<Item=Bytes, Error=PayloadError> {
} }
match self.poll_stream()? { match self.poll_stream()? {
Async::Ready(true) => self.readuntil(line), Async::Ready(true) => self.read_until(line),
Async::Ready(false) => Ok(Async::Ready(None)), Async::Ready(false) => Ok(Async::Ready(None)),
Async::NotReady => Ok(Async::NotReady), Async::NotReady => Ok(Async::NotReady),
} }
} }
pub fn readline(&mut self) -> Poll<Option<Bytes>, PayloadError> { pub fn readline(&mut self) -> Poll<Option<Bytes>, PayloadError> {
self.readuntil(b"\n") self.read_until(b"\n")
} }
pub fn unread_data(&mut self, data: Bytes) { pub fn unread_data(&mut self, data: Bytes) {

4
src/ws/frame.rs
View File

@ -198,6 +198,7 @@ impl Frame {
-> Poll<Option<Frame>, ProtocolError> -> Poll<Option<Frame>, ProtocolError>
where S: Stream<Item=Bytes, Error=PayloadError> where S: Stream<Item=Bytes, Error=PayloadError>
{ {
// try to parse ws frame md from one chunk
let result = match pl.get_chunk()? { let result = match pl.get_chunk()? {
Async::NotReady => return Ok(Async::NotReady), Async::NotReady => return Ok(Async::NotReady),
Async::Ready(Some(chunk)) => Frame::read_chunk_md(chunk, server, max_size)?, Async::Ready(Some(chunk)) => Frame::read_chunk_md(chunk, server, max_size)?,
@ -205,6 +206,7 @@ impl Frame {
}; };
let (idx, finished, opcode, length, mask) = match result { let (idx, finished, opcode, length, mask) = match result {
// we may need to join several chunks
Async::NotReady => match Frame::read_copy_md(pl, server, max_size)? { Async::NotReady => match Frame::read_copy_md(pl, server, max_size)? {
Async::NotReady => return Ok(Async::NotReady), Async::NotReady => return Ok(Async::NotReady),
Async::Ready(Some(item)) => item, Async::Ready(Some(item)) => item,
@ -228,7 +230,7 @@ impl Frame {
finished, opcode, payload: Binary::from("") }))); finished, opcode, payload: Binary::from("") })));
} }
let data = match pl.readexactly(length)? { let data = match pl.read_exact(length)? {
Async::Ready(Some(buf)) => buf, Async::Ready(Some(buf)) => buf,
Async::Ready(None) => return Ok(Async::Ready(None)), Async::Ready(None) => return Ok(Async::Ready(None)),
Async::NotReady => panic!(), Async::NotReady => panic!(),