berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

rename structs to avoid 'Copy' name conflict

This commit is contained in:
Michael Zhang 2018-12-20 23:19:13 -06:00
parent ebde013e90
commit 0e77119a30
No known key found for this signature in database
GPG Key ID: A1B65B603268116B
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/payload.rs
View File

@ -322,8 +322,8 @@ where
/// Read first available chunk of bytes /// Read first available chunk of bytes
#[inline] #[inline]
pub fn readany(&mut self) -> ReadAny<S> { pub fn readany(&mut self) -> PayloadReadAny<S> {
ReadAny { inner: self } PayloadReadAny { inner: self }
} }
/// Check if buffer contains enough bytes /// Check if buffer contains enough bytes
@ -358,8 +358,8 @@ where
/// Read exact number of bytes /// Read exact number of bytes
#[inline] #[inline]
pub fn read_exact(&mut self, size: usize) -> ReadExact<S> { pub fn read_exact(&mut self, size: usize) -> PayloadReadExact<S> {
ReadExact { inner: self, size } PayloadReadExact { inner: self, size }
} }
/// Remove specified amount if bytes from buffer /// Remove specified amount if bytes from buffer
@ -382,17 +382,17 @@ where
} }
/// Copy buffered data /// Copy buffered data
pub fn copy(&mut self, size: usize) -> Copy<S> { pub fn copy(&mut self, size: usize) -> PayloadCopy<S> {
Copy { inner: self, size } PayloadCopy { inner: self, size }
} }
/// Read until specified ending /// Read until specified ending
pub fn read_until(&mut self, line: &[u8]) -> ReadUntil<S> { pub fn read_until(&mut self, line: &[u8]) -> PayloadReadUntil<S> {
ReadUntil { inner: self, line: line.to_vec() } PayloadReadUntil { inner: self, line: line.to_vec() }
} }
/// Read bytes until new line delimiter /// Read bytes until new line delimiter
pub fn readline(&mut self) -> ReadUntil<S> { pub fn readline(&mut self) -> PayloadReadUntil<S> {
self.read_until(b"\n") self.read_until(b"\n")
} }
@ -413,11 +413,11 @@ where
} }
} }
pub struct ReadAny<'a, S> { pub struct PayloadReadAny<'a, S> {
inner: &'a mut PayloadBuffer<S>, inner: &'a mut PayloadBuffer<S>,
} }
impl<'a, S: 'a> Stream for ReadAny<'a, S> impl<'a, S: 'a> Stream for PayloadReadAny<'a, S>
where where
S: Stream<Item = Bytes, Error = PayloadError>, S: Stream<Item = Bytes, Error = PayloadError>,
{ {
@ -437,12 +437,12 @@ where
} }
} }
pub struct ReadExact<'a, S> { pub struct PayloadReadExact<'a, S> {
inner: &'a mut PayloadBuffer<S>, inner: &'a mut PayloadBuffer<S>,
size: usize, size: usize,
} }
impl<'a, S: 'a> Stream for ReadExact<'a, S> impl<'a, S: 'a> Stream for PayloadReadExact<'a, S>
where where
S: Stream<Item = Bytes, Error = PayloadError>, S: Stream<Item = Bytes, Error = PayloadError>,
{ {
@ -482,12 +482,12 @@ where
} }
} }
pub struct Copy<'a, S> { pub struct PayloadCopy<'a, S> {
inner: &'a mut PayloadBuffer<S>, inner: &'a mut PayloadBuffer<S>,
size: usize, size: usize,
} }
impl<'a, S: 'a> Stream for Copy<'a, S> impl<'a, S: 'a> Stream for PayloadCopy<'a, S>
where where
S: Stream<Item = Bytes, Error = PayloadError> S: Stream<Item = Bytes, Error = PayloadError>
{ {
@ -515,12 +515,12 @@ where
} }
} }
pub struct ReadUntil<'a, S> { pub struct PayloadReadUntil<'a, S> {
inner: &'a mut PayloadBuffer<S>, inner: &'a mut PayloadBuffer<S>,
line: Vec<u8>, line: Vec<u8>,
} }
impl<'a, S: 'a> Stream for ReadUntil<'a, S> impl<'a, S: 'a> Stream for PayloadReadUntil<'a, S>
where where
S: Stream<Item = Bytes, Error = PayloadError>, S: Stream<Item = Bytes, Error = PayloadError>,
{ {