diff --git a/Cargo.lock b/Cargo.lock index d71390cfbb6..65b52a91131 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -291,40 +291,38 @@ dependencies = [ [[package]] name = "bollard" -version = "0.10.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "699194c00f3a2effd3358d47f880646818e3d483190b17ebcdf598c654fb77e9" +checksum = "1b1d4b9e55620571c2200f4be87db2a9a69e2a107fc7d206a6accad58c3536cb" dependencies = [ "base64 0.13.0", "bollard-stubs", "bytes 1.0.1", "chrono", - "ct-logs", - "dirs-next", "futures-core", "futures-util", "hex", "http 0.2.3", "hyper 0.14.5", - "hyper-unix-connector", + "hyperlocal", "log 0.4.11", - "pin-project 1.0.5", + "pin-project-lite 0.2.8", "serde", "serde_derive", "serde_json", "serde_urlencoded", "thiserror", - "tokio 1.4.0", - "tokio-util 0.6.3", + "tokio 1.16.1", + "tokio-util 0.7.1", "url 2.2.1", "winapi 0.3.9", ] [[package]] name = "bollard-stubs" -version = "1.41.0" +version = "1.42.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2f2e73fffe9455141e170fb9c1feb0ac521ec7e7dcd47a7cab72a658490fb8" +checksum = "4295240332c78d04291f3ac857a281d5534a8e036f3dfcdaa294b22c0d424427" dependencies = [ "chrono", "serde", @@ -791,15 +789,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "ct-logs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" -dependencies = [ - "sct", -] - [[package]] name = "ctor" version = "0.1.16" @@ -1448,7 +1437,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.8", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -1911,7 +1900,7 @@ dependencies = [ "futures 0.3.13", "lazy_static", "port_check", - "tokio 1.4.0", + "tokio 1.16.1", "tokio-stream", ] @@ -1976,7 +1965,7 @@ dependencies = [ "http 0.2.3", "indexmap", "slab 0.4.2", - "tokio 1.4.0", + "tokio 1.16.1", "tokio-util 0.6.3", "tracing", ] @@ -2199,7 +2188,7 @@ dependencies = [ "itoa", "pin-project 1.0.5", "socket2 0.4.0", - "tokio 1.4.0", + "tokio 1.16.1", "tower-service", "tracing", "want 0.3.0", @@ -2232,16 +2221,16 @@ dependencies = [ ] [[package]] -name = "hyper-unix-connector" -version = "0.2.2" +name = "hyperlocal" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ef1fd95d34b4ff007d3f0590727b5cf33572cace09b42032fc817dc8b16557" +checksum = "0fafdf7b2b2de7c9784f76e02c0935e65a8117ec3b768644379983ab333ac98c" dependencies = [ - "anyhow", + "futures-util", "hex", "hyper 0.14.5", "pin-project 1.0.5", - "tokio 1.4.0", + "tokio 1.16.1", ] [[package]] @@ -3146,9 +3135,9 @@ checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" [[package]] name = "pin-project-lite" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" +checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" [[package]] name = "pin-utils" @@ -3178,7 +3167,7 @@ dependencies = [ "fallible-iterator 0.2.0", "futures 0.3.13", "log 0.4.11", - "tokio 1.4.0", + "tokio 1.16.1", "tokio-postgres", ] @@ -3758,7 +3747,7 @@ dependencies = [ "mime_guess", "native-tls", "percent-encoding 2.1.0", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.8", "serde", "serde_json", "serde_urlencoded", @@ -3771,21 +3760,6 @@ dependencies = [ "winreg", ] -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi 0.3.9", -] - [[package]] name = "rlp" version = "0.4.6" @@ -3906,16 +3880,6 @@ dependencies = [ "syn 1.0.67", ] -[[package]] -name = "sct" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "secp256k1" version = "0.20.1" @@ -4235,12 +4199,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "stable-hash" version = "0.3.1" @@ -4591,20 +4549,19 @@ dependencies = [ [[package]] name = "tokio" -version = "1.4.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134af885d758d645f0f0505c9a8b3f9bf8a348fd822e112ab5248138348f1722" +checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a" dependencies = [ - "autocfg 1.0.1", "bytes 1.0.1", "libc", "memchr", "mio 0.7.9", "num_cpus", "once_cell", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.8", "signal-hook-registry", - "tokio-macros 1.1.0", + "tokio-macros 1.7.0", "winapi 0.3.9", ] @@ -4704,9 +4661,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.1.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57" +checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", @@ -4728,11 +4685,11 @@ dependencies = [ "parking_lot 0.11.1", "percent-encoding 2.1.0", "phf", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.8", "postgres-protocol", "postgres-types", "socket2 0.4.0", - "tokio 1.4.0", + "tokio 1.16.1", "tokio-util 0.6.3", ] @@ -4773,8 +4730,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8864d706fdb3cc0843a49647ac892720dac98a6eeb818b77190592cf4994066" dependencies = [ "futures-core", - "pin-project-lite 0.2.6", - "tokio 1.4.0", + "pin-project-lite 0.2.8", + "tokio 1.16.1", "tokio-util 0.6.3", ] @@ -4949,8 +4906,22 @@ dependencies = [ "futures-core", "futures-sink", "log 0.4.11", - "pin-project-lite 0.2.6", - "tokio 1.4.0", + "pin-project-lite 0.2.8", + "tokio 1.16.1", +] + +[[package]] +name = "tokio-util" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" +dependencies = [ + "bytes 1.0.1", + "futures-core", + "futures-sink", + "pin-project-lite 0.2.8", + "tokio 1.16.1", + "tracing", ] [[package]] @@ -4970,21 +4941,33 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" [[package]] name = "tracing" -version = "0.1.21" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27" +checksum = "80b9fa4360528139bc96100c160b7ae879f5567f49f1782b0b02035b0358ebf3" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "log 0.4.11", - "pin-project-lite 0.1.11", + "pin-project-lite 0.2.8", + "tracing-attributes", "tracing-core", ] +[[package]] +name = "tracing-attributes" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b" +dependencies = [ + "proc-macro2 1.0.24", + "quote 1.0.9", + "syn 1.0.67", +] + [[package]] name = "tracing-core" -version = "0.1.17" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" +checksum = "90442985ee2f57c9e1b548ee72ae842f4a9a20e3f417cc38dbc5dc684d9bb4ee" dependencies = [ "lazy_static", ] @@ -5129,12 +5112,6 @@ dependencies = [ "void", ] -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "url" version = "1.7.2" diff --git a/tests/Cargo.toml b/tests/Cargo.toml index f3a83bd8012..e5d56140363 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -4,7 +4,7 @@ version = "0.23.1" edition = "2018" [dev-dependencies] -bollard = "0.10" +bollard = "0.12" tokio = {version = "1.2.0", features = ["rt", "macros", "process"]} tokio-stream = "0.1" futures = "0.3.13"