Auto merge of #7976 - frewsxcv:clippy, r=jdm

Cleanup code that was warned by rust-clippy

[whitespace agnostic diff](https://github.com/servo/servo/pull/7976/files?w=1)

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7976)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-10-12 04:37:42 -06:00
commit ac1b595609
9 changed files with 271 additions and 284 deletions

View file

@ -419,19 +419,19 @@ impl<R: HttpResponse> StreamedResponse<R> {
let result = GzDecoder::new(response);
match result {
Ok(response_decoding) => {
return Ok(StreamedResponse::new(m, Decoder::Gzip(response_decoding)));
Ok(StreamedResponse::new(m, Decoder::Gzip(response_decoding)))
}
Err(err) => {
return Err(LoadError::Decoding(m.final_url, err.to_string()));
Err(LoadError::Decoding(m.final_url, err.to_string()))
}
}
}
Some(Encoding::Deflate) => {
let response_decoding = DeflateDecoder::new(response);
return Ok(StreamedResponse::new(m, Decoder::Deflate(response_decoding)));
Ok(StreamedResponse::new(m, Decoder::Deflate(response_decoding)))
}
_ => {
return Ok(StreamedResponse::new(m, Decoder::Plain(response)));
Ok(StreamedResponse::new(m, Decoder::Plain(response)))
}
}
}