refactor(http1): apply a few clippy suggestions

use is_empty() instead of .len()
use if let instead of match
This commit is contained in:
bishtpawan
2019-04-24 01:26:30 +05:30
committed by Sean McArthur
parent f5885f3d5d
commit 0c1e1823f8

View File

@@ -65,7 +65,7 @@ impl Http1Transaction for Server {
const LOG: &'static str = "{role=server}"; const LOG: &'static str = "{role=server}";
fn parse(buf: &mut BytesMut, ctx: ParseContext) -> ParseResult<RequestLine> { fn parse(buf: &mut BytesMut, ctx: ParseContext) -> ParseResult<RequestLine> {
if buf.len() == 0 { if buf.is_empty() {
return Ok(None); return Ok(None);
} }
@@ -575,7 +575,7 @@ impl Http1Transaction for Client {
fn parse(buf: &mut BytesMut, ctx: ParseContext) -> ParseResult<StatusCode> { fn parse(buf: &mut BytesMut, ctx: ParseContext) -> ParseResult<StatusCode> {
// Loop to skip information status code headers (100 Continue, etc). // Loop to skip information status code headers (100 Continue, etc).
loop { loop {
if buf.len() == 0 { if buf.is_empty() {
return Ok(None); return Ok(None);
} }
// Unsafe: see comment in Server Http1Transaction, above. // Unsafe: see comment in Server Http1Transaction, above.
@@ -615,9 +615,8 @@ impl Http1Transaction for Client {
let name = header_name!(&slice[header.name.0..header.name.1]); let name = header_name!(&slice[header.name.0..header.name.1]);
let value = header_value!(slice.slice(header.value.0, header.value.1)); let value = header_value!(slice.slice(header.value.0, header.value.1));
match name { if let header::CONNECTION = name {
header::CONNECTION => { // keep_alive was previously set to default for Version
// keep_alive was previously set to default for Version
if keep_alive { if keep_alive {
// HTTP/1.1 // HTTP/1.1
keep_alive = !headers::connection_close(&value); keep_alive = !headers::connection_close(&value);
@@ -626,9 +625,7 @@ impl Http1Transaction for Client {
// HTTP/1.0 // HTTP/1.0
keep_alive = headers::connection_keep_alive(&value); keep_alive = headers::connection_keep_alive(&value);
} }
}, }
_ => (),
}
headers.append(name, value); headers.append(name, value);
} }
@@ -734,12 +731,9 @@ impl Client {
Some(Method::HEAD) => { Some(Method::HEAD) => {
return Ok(Some((DecodedLength::ZERO, false))); return Ok(Some((DecodedLength::ZERO, false)));
} }
Some(Method::CONNECT) => match inc.subject.as_u16() { Some(Method::CONNECT) => if let 200...299 = inc.subject.as_u16() {
200...299 => { return Ok(Some((DecodedLength::ZERO, true)));
return Ok(Some((DecodedLength::ZERO, true))); }
},
_ => {},
},
Some(_) => {}, Some(_) => {},
None => { None => {
trace!("Client::decoder is missing the Method"); trace!("Client::decoder is missing the Method");