From 77015d44490f773977f7e85543084e82e536f69f Mon Sep 17 00:00:00 2001 From: Bastien Orivel Date: Sun, 18 Nov 2018 21:20:47 +0100 Subject: [PATCH] Update brotli --- Cargo.lock | 31 +++++++++++++++++++++---------- components/net/Cargo.toml | 2 +- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9ac0611c9cb..14406ef28ce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,9 +13,17 @@ dependencies = [ [[package]] name = "alloc-no-stdlib" -version = "1.3.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "alloc-stdlib" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "alloc-no-stdlib 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "andrew" version = "0.1.4" @@ -281,19 +289,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "brotli" -version = "2.5.0" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "alloc-no-stdlib 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "brotli-decompressor 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "alloc-no-stdlib 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "alloc-stdlib 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "brotli-decompressor 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "brotli-decompressor" -version = "1.3.1" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "alloc-no-stdlib 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "alloc-no-stdlib 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "alloc-stdlib 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2509,7 +2519,7 @@ name = "net" version = "0.0.1" dependencies = [ "base64 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", - "brotli 2.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "brotli 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "cookie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-channel 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4782,7 +4792,8 @@ dependencies = [ [metadata] "checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c" "checksum aho-corasick 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f0ba20154ea1f47ce2793322f049c5646cc6d0fa9759d5f333f286e507bf8080" -"checksum alloc-no-stdlib 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "71877e174a5d78c969228d628c4f7f3b545d13452bd3d9393fa07aacfb7c6894" +"checksum alloc-no-stdlib 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "89376a1f1a188ddc8b54198370fd7b62568162bb8a0c5bf0684cd29933e37284" +"checksum alloc-stdlib 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "697ed7edc0f1711de49ce108c541623a0af97c6c60b2f6e2b65229847ac843c2" "checksum andrew 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "62ea7024f6f4d203bede7c0c9cdafa3cbda3a9e0fa04d349008496cc95b8f11b" "checksum android_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "000444226fcff248f2bc4c7625be32c63caccfecc2723a2b9f78a7487a49c407" "checksum android_injected_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "80b9e34fcbf29c0563547cb2ecce9b49504597cad6166769b1e4efb45c6c2951" @@ -4813,8 +4824,8 @@ dependencies = [ "checksum blurmock 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9c150fd617830fd121919bbd500a784507e8af1bae744efcf587591c65c375d4" "checksum blurz 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f6dae8337ff67fe8ead29a28a0115605753e6a5205d4b6017e9f42f198c3c50a" "checksum boxfnonce 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cbec60c560f322d8e3cd403f91d8908cfd965fff53ba97154bd1b9d90149d98e" -"checksum brotli 2.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8c6236055e28bc092d6d370f3219e6939d8ba8352b397e290391bb8af0d94f25" -"checksum brotli-decompressor 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "471bf19486c9aaf5b817ed04c49ccc8acd8d28c70d5114e710e8b9f530df89cd" +"checksum brotli 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "866aa77580d9501b6d87e0bcbb6605403df764d356b8ee65e1510bcba6a45fc0" +"checksum brotli-decompressor 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "71867b8c3aaff6c493969d2166a9a9ff5321fcc6c6346115dc66b3dd3ff8bd5b" "checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39" "checksum byte-slice-cast 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "28346c117b50270785fbc123bd6e4ecad20d0c6d5f43d081dc80a3abcc62be64" "checksum byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40" diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index f3eb07e0cc3..03a618e6323 100644 --- a/components/net/Cargo.toml +++ b/components/net/Cargo.toml @@ -17,7 +17,7 @@ doctest = false [dependencies] base64 = "0.9" -brotli = "2.5" +brotli = "3" bytes = "0.4" cookie_rs = {package = "cookie", version = "0.11"} crossbeam-channel = "0.3"