From 877f441422f739c61d2e8b1d455b58d327921f75 Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Tue, 5 Jan 2021 22:11:15 +0100 Subject: [PATCH] Update reqwest --- Cargo.lock | 183 ++++++----------------------- components/link_checker/Cargo.toml | 2 +- components/templates/Cargo.toml | 2 +- 3 files changed, 38 insertions(+), 149 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ce7dab7a..0fc19c3c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -85,12 +85,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - [[package]] name = "base64" version = "0.13.0" @@ -846,26 +840,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "h2" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" -dependencies = [ - "bytes 0.5.6", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio 0.2.24", - "tokio-util 0.3.1", - "tracing", - "tracing-futures", -] - [[package]] name = "h2" version = "0.3.0" @@ -880,8 +854,8 @@ dependencies = [ "http", "indexmap", "slab", - "tokio 1.0.1", - "tokio-util 0.6.0", + "tokio", + "tokio-util", "tracing", "tracing-futures", ] @@ -939,16 +913,6 @@ dependencies = [ "itoa", ] -[[package]] -name = "http-body" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" -dependencies = [ - "bytes 0.5.6", - "http", -] - [[package]] name = "http-body" version = "0.4.0" @@ -977,30 +941,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6cab2627acfc432780848602f3f558f7e9dd427352224b0d9324025796d2a5e" -[[package]] -name = "hyper" -version = "0.13.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf" -dependencies = [ - "bytes 0.5.6", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.2.7", - "http", - "http-body 0.3.1", - "httparse", - "httpdate", - "itoa", - "pin-project 1.0.3", - "socket2", - "tokio 0.2.24", - "tower-service", - "tracing", - "want", -] - [[package]] name = "hyper" version = "0.14.2" @@ -1011,15 +951,15 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.3.0", + "h2", "http", - "http-body 0.4.0", + "http-body", "httparse", "httpdate", "itoa", "pin-project 1.0.3", "socket2", - "tokio 1.0.1", + "tokio", "tower-service", "tracing", "want", @@ -1027,16 +967,15 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.21.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37743cc83e8ee85eacfce90f2f4102030d9ff0a95244098d781e9bee4a90abb6" +checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" dependencies = [ - "bytes 0.5.6", "futures-util", - "hyper 0.13.9", + "hyper", "log", "rustls", - "tokio 0.2.24", + "tokio", "tokio-rustls", "webpki", ] @@ -1422,16 +1361,6 @@ version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" -[[package]] -name = "mime_guess" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212" -dependencies = [ - "mime", - "unicase", -] - [[package]] name = "minify-html" version = "0.3.10" @@ -1905,12 +1834,6 @@ dependencies = [ "syn", ] -[[package]] -name = "pin-project-lite" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" - [[package]] name = "pin-project-lite" version = "0.2.1" @@ -1935,7 +1858,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dc57ccf442c7414b790e8e7b72fb4d776a66c7680129360946d9aaa6f5311e9" dependencies = [ - "base64 0.13.0", + "base64", "chrono", "indexmap", "line-wrap", @@ -2232,31 +2155,30 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.10.10" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" +checksum = "fd281b1030aa675fb90aa994d07187645bb3c8fc756ca766e7c3070b439de9de" dependencies = [ - "base64 0.13.0", - "bytes 0.5.6", + "base64", + "bytes 1.0.0", "encoding_rs", "futures-core", "futures-util", "http", - "http-body 0.3.1", - "hyper 0.13.9", + "http-body", + "hyper", "hyper-rustls", "ipnet", "js-sys", "lazy_static", "log", "mime", - "mime_guess", "percent-encoding", - "pin-project-lite 0.2.1", + "pin-project-lite", "rustls", "serde", "serde_urlencoded 0.7.0", - "tokio 0.2.24", + "tokio", "tokio-rustls", "url", "wasm-bindgen", @@ -2302,11 +2224,11 @@ dependencies = [ [[package]] name = "rustls" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81" +checksum = "064fd21ff87c6e87ed4506e68beb42459caa4a0e2eb144932e6776768556980b" dependencies = [ - "base64 0.12.3", + "base64", "log", "ring", "sct", @@ -2678,7 +2600,7 @@ dependencies = [ name = "templates" version = "0.1.0" dependencies = [ - "base64 0.13.0", + "base64", "config", "csv", "errors", @@ -2808,24 +2730,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" -[[package]] -name = "tokio" -version = "0.2.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48" -dependencies = [ - "bytes 0.5.6", - "fnv", - "futures-core", - "iovec", - "lazy_static", - "memchr", - "mio 0.6.23", - "num_cpus", - "pin-project-lite 0.1.11", - "slab", -] - [[package]] name = "tokio" version = "1.0.1" @@ -2837,18 +2741,18 @@ dependencies = [ "libc", "memchr", "mio 0.7.7", - "pin-project-lite 0.2.1", + "num_cpus", + "pin-project-lite", ] [[package]] name = "tokio-rustls" -version = "0.14.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a" +checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ - "futures-core", "rustls", - "tokio 0.2.24", + "tokio", "webpki", ] @@ -2859,22 +2763,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4cdeb73537e63f98adcd73138af75e3f368ccaecffaa29d7eb61b9f5a440457" dependencies = [ "futures-core", - "pin-project-lite 0.2.1", - "tokio 1.0.1", -] - -[[package]] -name = "tokio-util" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" -dependencies = [ - "bytes 0.5.6", - "futures-core", - "futures-sink", - "log", - "pin-project-lite 0.1.11", - "tokio 0.2.24", + "pin-project-lite", + "tokio", ] [[package]] @@ -2887,8 +2777,8 @@ dependencies = [ "futures-core", "futures-sink", "log", - "pin-project-lite 0.2.1", - "tokio 1.0.1", + "pin-project-lite", + "tokio", "tokio-stream", ] @@ -2914,8 +2804,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3" dependencies = [ "cfg-if 1.0.0", - "log", - "pin-project-lite 0.2.1", + "pin-project-lite", "tracing-core", ] @@ -3233,9 +3122,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f" +checksum = "82015b7e0b8bad8185994674a13a93306bea76cf5a16c5a181382fd3a5ec2376" dependencies = [ "webpki", ] @@ -3370,7 +3259,7 @@ dependencies = [ "errors", "front_matter", "globset", - "hyper 0.14.2", + "hyper", "lazy_static", "notify", "open", @@ -3378,7 +3267,7 @@ dependencies = [ "serde_json", "site", "termcolor", - "tokio 1.0.1", + "tokio", "url", "utils", "ws", diff --git a/components/link_checker/Cargo.toml b/components/link_checker/Cargo.toml index f5b8c3a1..70cfebfb 100644 --- a/components/link_checker/Cargo.toml +++ b/components/link_checker/Cargo.toml @@ -11,7 +11,7 @@ config = { path = "../config" } errors = { path = "../errors" } [dependencies.reqwest] -version = "0.10" +version = "0.11" default-features = false features = ["blocking", "rustls-tls"] diff --git a/components/templates/Cargo.toml b/components/templates/Cargo.toml index e1f95006..e32fb494 100644 --- a/components/templates/Cargo.toml +++ b/components/templates/Cargo.toml @@ -25,7 +25,7 @@ imageproc = { path = "../imageproc" } rendering = { path = "../rendering" } [dependencies.reqwest] -version = "0.10" +version = "0.11" default-features = false features = ["blocking", "rustls-tls"]