From 0ed46fa33d3cd67b9c7b2ddf166e43cce3b0c69e Mon Sep 17 00:00:00 2001 From: "Aode (lion)" Date: Sun, 31 Oct 2021 13:45:18 -0500 Subject: [PATCH] Bump deps --- Cargo.lock | 118 +++++++++++------------------------------------------ Cargo.toml | 2 +- 2 files changed, 24 insertions(+), 96 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 94967fd..28727d5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -46,7 +46,7 @@ dependencies = [ "actix-tls", "actix-utils", "ahash 0.7.6", - "base64 0.13.0", + "base64", "bitflags", "bytes", "bytestring", @@ -169,7 +169,7 @@ dependencies = [ "futures-core", "http", "log", - "tokio-rustls 0.23.0", + "tokio-rustls 0.23.1", "tokio-util", "webpki-roots 0.22.1", ] @@ -324,23 +324,6 @@ dependencies = [ "syn", ] -[[package]] -name = "attohttpc" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8bda305457262b339322106c776e3fd21df860018e566eb6a5b1aa4b6ae02d" -dependencies = [ - "http", - "log", - "rustls 0.18.1", - "serde 1.0.130", - "serde_json", - "url", - "webpki 0.21.4", - "webpki-roots 0.19.0", - "wildmatch", -] - [[package]] name = "atty" version = "0.2.14" @@ -368,7 +351,7 @@ dependencies = [ "actix-http", "actix-rt", "actix-service", - "base64 0.13.0", + "base64", "bytes", "cfg-if", "derive_more", @@ -388,11 +371,9 @@ dependencies = [ [[package]] name = "aws-creds" version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e1c8f64305d3f3096cb247983a3cae16f8c2960129699bcb70639e31180794" +source = "git+https://github.com/asonix/rust-s3?branch=asonix/main#8829310b9966d1081a8dab8031bed49b3e5d56f0" dependencies = [ "anyhow", - "attohttpc", "dirs", "rust-ini 0.17.0", "serde 1.0.130", @@ -410,12 +391,6 @@ dependencies = [ "anyhow", ] -[[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" @@ -1075,9 +1050,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "869d572136620d55835903746bcb5cdc54cb2851fd0aeec53220b4bb65ef3013" +checksum = "a60553f9a9e039a333b4e9b20573b9e9b9c0bb3a11e201ccc48ef4283456d673" [[package]] name = "linked-hash-map" @@ -1174,15 +1149,6 @@ version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" -[[package]] -name = "minidom" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332592c2149fc7dd40a64fc9ef6f0d65607284b474cef9817d1fc8c7e7b3608e" -dependencies = [ - "quick-xml", -] - [[package]] name = "mio" version = "0.7.14" @@ -1394,7 +1360,7 @@ dependencies = [ "anyhow", "async-trait", "awc", - "base64 0.13.0", + "base64", "config", "dashmap", "futures-util", @@ -1563,15 +1529,6 @@ dependencies = [ "prost", ] -[[package]] -name = "quick-xml" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26aab6b48e2590e4a64d1ed808749ba06257882b461d01ca71baeb747074a6dd" -dependencies = [ - "memchr", -] - [[package]] name = "quote" version = "1.0.10" @@ -1681,7 +1638,7 @@ version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66d2927ca2f685faf0fc620ac4834690d29e7abb153add10f5812eef20b5e280" dependencies = [ - "base64 0.13.0", + "base64", "bytes", "encoding_rs", "futures-core", @@ -1754,23 +1711,22 @@ dependencies = [ [[package]] name = "rust-s3" version = "0.27.0" -source = "git+https://github.com/asonix/rust-s3?branch=asonix/use-async-write#f61e422d77484288cf32e40896c8b361eb60afac" +source = "git+https://github.com/asonix/rust-s3?branch=asonix/main#8829310b9966d1081a8dab8031bed49b3e5d56f0" dependencies = [ "anyhow", "async-trait", "aws-creds", "aws-region", - "base64 0.13.0", + "base64", "cfg-if", "chrono", - "futures", + "futures-io", "hex", "hmac", "http", "log", "maybe-async", "md5", - "minidom", "percent-encoding", "reqwest", "serde 1.0.130", @@ -1791,26 +1747,13 @@ dependencies = [ "semver", ] -[[package]] -name = "rustls" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81" -dependencies = [ - "base64 0.12.3", - "log", - "ring", - "sct 0.6.1", - "webpki 0.21.4", -] - [[package]] name = "rustls" version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ - "base64 0.13.0", + "base64", "log", "ring", "sct 0.6.1", @@ -2199,9 +2142,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2c2416fdedca8443ae44b4527de1ea633af61d8f7169ffa6e72c5b53d24efcc" +checksum = "588b2d10a336da58d877567cd8fb8a14b463e2104910f8132cd054b4b96e29ee" dependencies = [ "autocfg", "bytes", @@ -2229,9 +2172,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2dd85aeaba7b68df939bd357c6afb36c87951be9e80bf9c859f2fc3e9fca0fd" +checksum = "114383b041aa6212c579467afa0075fbbdd0718de036100bc0ba7961d8cb9095" dependencies = [ "proc-macro2", "quote", @@ -2251,9 +2194,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.23.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d49194a46b06a69f2498a34a595ab4a9c1babd2642ffa3dbccf6c6778d1426f2" +checksum = "4baa378e417d780beff82bf54ceb0d195193ea6a00c14e22359e7f39456b5689" dependencies = [ "rustls 0.20.0", "tokio", @@ -2262,9 +2205,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f" +checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" dependencies = [ "futures-core", "pin-project-lite", @@ -2286,9 +2229,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.6.8" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d3725d3efa29485e87311c5b699de63cde14b00ed4d256b8318aa30ca452cd" +checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" dependencies = [ "bytes", "futures-core", @@ -2315,7 +2258,7 @@ checksum = "796c5e1cd49905e65dd8e700d4cb1dffcbfdb4fc9d017de08c1a537afd83627c" dependencies = [ "async-stream", "async-trait", - "base64 0.13.0", + "base64", "bytes", "futures-core", "futures-util", @@ -2732,15 +2675,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "webpki-roots" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8eff4b7516a57307f9349c64bf34caa34b940b66fed4b2fb3136cb7386e5739" -dependencies = [ - "webpki 0.21.4", -] - [[package]] name = "webpki-roots" version = "0.21.1" @@ -2770,12 +2704,6 @@ dependencies = [ "libc", ] -[[package]] -name = "wildmatch" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f44b95f62d34113cf558c93511ac93027e03e9c29a60dd0fd70e6e025c7270a" - [[package]] name = "winapi" version = "0.3.9" diff --git a/Cargo.toml b/Cargo.toml index 669c913..8bff8a5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,7 @@ opentelemetry = { version = "0.16", features = ["rt-tokio"] } opentelemetry-otlp = "0.9" pin-project-lite = "0.2.7" reqwest = { version = "0.11.5", default-features = false, features = ["stream"], optional = true} -rust-s3 = { version = "0.27.0", default-features = false, features = ["tokio-rustls-tls"], optional = true, git = "https://github.com/asonix/rust-s3", branch = "asonix/use-async-write" } +rust-s3 = { version = "0.27.0", default-features = false, features = ["tokio-rustls-tls"], optional = true, git = "https://github.com/asonix/rust-s3", branch = "asonix/main" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" sha2 = "0.9.0"