Auto merge of #20143 - Eijebong:bump, r=nox

Bump itertools, image, flate2 and caseless

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20143)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-02-28 13:10:59 -05:00 committed by GitHub
commit af92c06223
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 32 additions and 32 deletions

View file

@ -13,7 +13,7 @@ path = "lib.rs"
euclid = "0.17"
gfx_traits = {path = "../gfx_traits"}
gleam = "0.4"
image = "0.17"
image = "0.18"
ipc-channel = "0.9"
libc = "0.2"
log = "0.3.5"

View file

@ -23,7 +23,7 @@ gfx = {path = "../gfx"}
gfx_traits = {path = "../gfx_traits"}
hyper = "0.10"
ipc-channel = "0.9"
itertools = "0.5"
itertools = "0.7"
layout_traits = {path = "../layout_traits"}
log = "0.3.5"
metrics = {path = "../metrics"}

View file

@ -16,7 +16,7 @@ base64 = "0.6"
brotli = "1.0.6"
cookie = "0.10"
devtools_traits = {path = "../devtools_traits"}
flate2 = "0.2.0"
flate2 = "1"
hyper = "0.10"
hyper_serde = "0.8"
hyper-openssl = "0.2.2"

View file

@ -290,7 +290,7 @@ impl StreamedResponse {
let decoder = {
if let Some(ref encoding) = response.headers.get::<ContentEncoding>().cloned() {
if encoding.contains(&Encoding::Gzip) {
Decoder::Gzip(GzDecoder::new(response)?)
Decoder::Gzip(GzDecoder::new(response))
}
else if encoding.contains(&Encoding::Deflate) {
Decoder::Deflate(DeflateDecoder::new(response))

View file

@ -394,7 +394,7 @@ fn test_load_when_redirecting_from_a_post_should_rewrite_next_request_as_get() {
fn test_load_should_decode_the_response_as_deflate_when_response_headers_have_content_encoding_deflate() {
let handler = move |_: HyperRequest, mut response: HyperResponse| {
response.headers_mut().set(ContentEncoding(vec![Encoding::Deflate]));
let mut e = DeflateEncoder::new(Vec::new(), Compression::Default);
let mut e = DeflateEncoder::new(Vec::new(), Compression::default());
e.write(b"Yay!").unwrap();
let encoded_content = e.finish().unwrap();
response.send(&encoded_content).unwrap();
@ -424,7 +424,7 @@ fn test_load_should_decode_the_response_as_deflate_when_response_headers_have_co
fn test_load_should_decode_the_response_as_gzip_when_response_headers_have_content_encoding_gzip() {
let handler = move |_: HyperRequest, mut response: HyperResponse| {
response.headers_mut().set(ContentEncoding(vec![Encoding::Gzip]));
let mut e = GzEncoder::new(Vec::new(), Compression::Default);
let mut e = GzEncoder::new(Vec::new(), Compression::default());
e.write(b"Yay!").unwrap();
let encoded_content = e.finish().unwrap();
response.send(&encoded_content).unwrap();

View file

@ -15,7 +15,7 @@ doctest = false
cookie = "0.10"
hyper = "0.10"
hyper_serde = "0.8"
image = "0.17"
image = "0.18"
ipc-channel = "0.9"
lazy_static = "1"
log = "0.3.5"

View file

@ -34,7 +34,7 @@ bitflags = "1.0"
bluetooth_traits = {path = "../bluetooth_traits"}
byteorder = "1.0"
canvas_traits = {path = "../canvas_traits"}
caseless = "0.1.0"
caseless = "0.2"
cookie = "0.10"
chrono = "0.4"
cssparser = "0.23.0"
@ -50,7 +50,7 @@ half = "1.0"
html5ever = "0.22"
hyper = "0.10"
hyper_serde = "0.8"
image = "0.17"
image = "0.18"
ipc-channel = "0.9"
jstraceable_derive = {path = "../jstraceable_derive"}
lazy_static = "1"

View file

@ -39,7 +39,7 @@ fallible = { path = "../fallible" }
fnv = "1.0"
hashglobe = { path = "../hashglobe" }
html5ever = {version = "0.22", optional = true}
itertools = "0.5"
itertools = "0.7.6"
itoa = "0.3"
lazy_static = "1"
log = "0.3"

View file

@ -14,7 +14,7 @@ base64 = "0.6"
cookie = "0.10"
euclid = "0.17"
hyper = "0.10"
image = "0.17"
image = "0.18"
ipc-channel = "0.9"
log = "0.3.5"
msg = {path = "../msg"}