forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style(lib): address clippy code style warnings

Browse Source 
* Remove unnecessary return statements.

* Combine identical `match` arms.

* Collapse nested conditional.

* Use `assert_ne` where applicable.

* Lifetime elision.
This commit is contained in:
Corey Farwell
2017-06-12 23:16:20 -04:00
committed by Sean McArthur
parent 5d19ef88b4
commit 1059eb349a
14 changed files with 38 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/http/conn.rs
View File

@@ -119,12 +119,12 @@ where I: AsyncRead + AsyncWrite,
(true, Reading::Body(decoder))
};
self.state.reading = reading;
return Ok(Async::Ready(Some(Frame::Message { message: head, body: body })));
Ok(Async::Ready(Some(Frame::Message { message: head, body: body })))
},
_ => {
error!("unimplemented HTTP Version = {:?}", version);
self.state.close_read();
return Ok(Async::Ready(Some(Frame::Error { error: ::Error::Version })));
Ok(Async::Ready(Some(Frame::Error { error: ::Error::Version })))
}
}
}
@@ -139,12 +139,10 @@ where I: AsyncRead + AsyncWrite,
let slice = try_nb!(decoder.decode(&mut self.io));
if !slice.is_empty() {
return Ok(Async::Ready(Some(http::Chunk::from(slice))));
} else if decoder.is_eof() {
(Reading::KeepAlive, Ok(Async::Ready(None)))
} else {
if decoder.is_eof() {
(Reading::KeepAlive, Ok(Async::Ready(None)))
} else {
(Reading::Closed, Ok(Async::Ready(None)))
}
(Reading::Closed, Ok(Async::Ready(None)))
}
},

6
src/http/h1/decode.rs
View File

@@ -198,7 +198,7 @@ impl ChunkedState {
// LWS can follow the chunk size, but no more digits can come
b'\t' | b' ' => Ok(ChunkedState::SizeLws),
b';' => Ok(ChunkedState::Extension),
b'\r' => return Ok(ChunkedState::SizeLf),
b'\r' => Ok(ChunkedState::SizeLf),
_ => {
Err(io::Error::new(io::ErrorKind::InvalidInput,
"Invalid chunk size linear white space"))
@@ -208,8 +208,8 @@ impl ChunkedState {
fn read_extension<R: MemRead>(rdr: &mut R) -> io::Result<ChunkedState> {
trace!("read_extension");
match byte!(rdr) {
b'\r' => return Ok(ChunkedState::SizeLf),
_ => return Ok(ChunkedState::Extension), // no supported extensions
b'\r' => Ok(ChunkedState::SizeLf),
_ => Ok(ChunkedState::Extension), // no supported extensions
}
}
fn read_size_lf<R: MemRead>(rdr: &mut R, size: &mut u64) -> io::Result<ChunkedState> {