From 3697a695b0edf0bad1ee4802840095d3b83b6235 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 May 2021 16:37:13 +0000 Subject: [PATCH] chore(deps): bump actix from 0.9.0 to 0.10.0 Bumps [actix](https://github.com/actix/actix) from 0.9.0 to 0.10.0. - [Release notes](https://github.com/actix/actix/releases) - [Changelog](https://github.com/actix/actix/blob/v0.10.0/CHANGES.md) - [Commits](https://github.com/actix/actix/compare/v0.9.0...v0.10.0) Signed-off-by: dependabot[bot] --- Cargo.lock | 427 ++++++----------------------------------------------- Cargo.toml | 2 +- 2 files changed, 48 insertions(+), 381 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0fb1a29e..829a0da0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,42 +2,27 @@ # It is not intended for manual editing. [[package]] name = "actix" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4af87564ff659dee8f9981540cac9418c45e910c8072fdedd643a262a38fcaf" +checksum = "1be241f88f3b1e7e9a3fbe3b5a8a0f6915b5a1d7ee0d9a248d3376d01068cc60" dependencies = [ - "actix-http 1.0.1", "actix-rt", "actix_derive", "bitflags", "bytes 0.5.6", "crossbeam-channel 0.4.4", "derive_more", - "futures", - "lazy_static", + "futures-channel", + "futures-util", "log", - "parking_lot 0.10.2", + "once_cell", + "parking_lot", "pin-project 0.4.28", "smallvec", "tokio 0.2.25", - "tokio-util 0.2.0", - "trust-dns-proto 0.18.0-alpha.2", - "trust-dns-resolver 0.18.0-alpha.2", -] - -[[package]] -name = "actix-codec" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09e55f0a5c2ca15795035d90c46bd0e73a5123b72f68f12596d6ba5282051380" -dependencies = [ - "bitflags", - "bytes 0.5.6", - "futures-core", - "futures-sink", - "log", - "tokio 0.2.25", - "tokio-util 0.2.0", + "tokio-util 0.3.1", + "trust-dns-proto", + "trust-dns-resolver", ] [[package]] @@ -56,42 +41,23 @@ dependencies = [ "tokio-util 0.3.1", ] -[[package]] -name = "actix-connect" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95cc9569221e9802bf4c377f6c18b90ef10227d787611decf79fd47d2a8e76c" -dependencies = [ - "actix-codec 0.2.0", - "actix-rt", - "actix-service", - "actix-utils 1.0.6", - "derive_more", - "either", - "futures", - "http", - "log", - "trust-dns-proto 0.18.0-alpha.2", - "trust-dns-resolver 0.18.0-alpha.2", -] - [[package]] name = "actix-connect" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "177837a10863f15ba8d3ae3ec12fac1099099529ed20083a27fdfe247381d0dc" dependencies = [ - "actix-codec 0.3.0", + "actix-codec", "actix-rt", "actix-service", - "actix-utils 2.0.0", + "actix-utils", "derive_more", "either", "futures-util", "http", "log", - "trust-dns-proto 0.19.7", - "trust-dns-resolver 0.19.7", + "trust-dns-proto", + "trust-dns-resolver", ] [[package]] @@ -108,63 +74,19 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "actix-http" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c16664cc4fdea8030837ad5a845eb231fb93fc3c5c171edfefb52fad92ce9019" -dependencies = [ - "actix-codec 0.2.0", - "actix-connect 1.0.2", - "actix-rt", - "actix-service", - "actix-threadpool", - "actix-utils 1.0.6", - "base64 0.11.0", - "bitflags", - "bytes 0.5.6", - "chrono", - "copyless", - "derive_more", - "either", - "encoding_rs", - "futures-channel", - "futures-core", - "futures-util", - "fxhash", - "h2", - "http", - "httparse", - "indexmap", - "language-tags", - "lazy_static", - "log", - "mime", - "percent-encoding", - "pin-project 0.4.28", - "rand 0.7.3", - "regex", - "serde", - "serde_json", - "serde_urlencoded 0.6.1", - "sha1", - "slab", - "time 0.1.44", -] - [[package]] name = "actix-http" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "452299e87817ae5673910e53c243484ca38be3828db819b6011736fc6982e874" dependencies = [ - "actix-codec 0.3.0", - "actix-connect 2.0.0", + "actix-codec", + "actix-connect", "actix-rt", "actix-service", "actix-threadpool", - "actix-utils 2.0.0", - "base64 0.13.0", + "actix-utils", + "base64", "bitflags", "brotli2", "bytes 0.5.6", @@ -193,10 +115,10 @@ dependencies = [ "regex", "serde", "serde_json", - "serde_urlencoded 0.7.0", + "serde_urlencoded", "sha-1", "slab", - "time 0.2.26", + "time", ] [[package]] @@ -243,10 +165,10 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45407e6e672ca24784baa667c5d32ef109ccdd8d5e0b5ebb9ef8a67f4dfb708e" dependencies = [ - "actix-codec 0.3.0", + "actix-codec", "actix-rt", "actix-service", - "actix-utils 2.0.0", + "actix-utils", "futures-channel", "futures-util", "log", @@ -292,7 +214,7 @@ dependencies = [ "lazy_static", "log", "num_cpus", - "parking_lot 0.11.1", + "parking_lot", "threadpool", ] @@ -302,37 +224,19 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24789b7d7361cf5503a504ebe1c10806896f61e96eca9a7350e23001aca715fb" dependencies = [ - "actix-codec 0.3.0", + "actix-codec", "actix-service", - "actix-utils 2.0.0", + "actix-utils", "futures-util", ] -[[package]] -name = "actix-utils" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf8f5631bf01adec2267808f00e228b761c60c0584cc9fa0b5364f41d147f4e" -dependencies = [ - "actix-codec 0.2.0", - "actix-rt", - "actix-service", - "bitflags", - "bytes 0.5.6", - "either", - "futures", - "log", - "pin-project 0.4.28", - "slab", -] - [[package]] name = "actix-utils" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e9022dec56632d1d7979e59af14f0597a28a830a9c1c7fec8b2327eb9f16b5a" dependencies = [ - "actix-codec 0.3.0", + "actix-codec", "actix-rt", "actix-service", "bitflags", @@ -352,8 +256,8 @@ version = "3.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e641d4a172e7faa0862241a20ff4f1f5ab0ab7c279f00c2d4587b77483477b86" dependencies = [ - "actix-codec 0.3.0", - "actix-http 2.2.0", + "actix-codec", + "actix-http", "actix-macros", "actix-router", "actix-rt", @@ -362,7 +266,7 @@ dependencies = [ "actix-testing", "actix-threadpool", "actix-tls", - "actix-utils 2.0.0", + "actix-utils", "actix-web-codegen", "awc", "bytes 0.5.6", @@ -378,9 +282,9 @@ dependencies = [ "regex", "serde", "serde_json", - "serde_urlencoded 0.7.0", + "serde_urlencoded", "socket2 0.3.19", - "time 0.2.26", + "time", "tinyvec", "url", ] @@ -407,15 +311,6 @@ dependencies = [ "syn", ] -[[package]] -name = "addr2line" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7" -dependencies = [ - "gimli", -] - [[package]] name = "adler" version = "1.0.2" @@ -465,11 +360,11 @@ version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b381e490e7b0cfc37ebc54079b0413d8093ef43d14a4e4747083f7fa47a9e691" dependencies = [ - "actix-codec 0.3.0", - "actix-http 2.2.0", + "actix-codec", + "actix-http", "actix-rt", "actix-service", - "base64 0.13.0", + "base64", "bytes 0.5.6", "cfg-if 1.0.0", "derive_more", @@ -480,21 +375,7 @@ dependencies = [ "rand 0.7.3", "serde", "serde_json", - "serde_urlencoded 0.7.0", -] - -[[package]] -name = "backtrace" -version = "0.3.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ed203b9ba68b242c62b3fb7480f589dd49829be1edb3fe8fc8b4ffda2dcb8d" -dependencies = [ - "addr2line", - "cfg-if 1.0.0", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", + "serde_urlencoded", ] [[package]] @@ -503,12 +384,6 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" -[[package]] -name = "base64" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" - [[package]] name = "base64" version = "0.13.0" @@ -628,19 +503,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "chrono" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" -dependencies = [ - "libc", - "num-integer", - "num-traits", - "time 0.1.44", - "winapi 0.3.9", -] - [[package]] name = "clap" version = "2.33.3" @@ -652,15 +514,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags", -] - [[package]] name = "const_fn" version = "0.4.7" @@ -680,7 +533,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" dependencies = [ "percent-encoding", - "time 0.2.26", + "time", "version_check", ] @@ -940,28 +793,6 @@ dependencies = [ "termcolor", ] -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - [[package]] name = "fallible-iterator" version = "0.2.0" @@ -1160,12 +991,6 @@ dependencies = [ "wasi 0.10.0+wasi-snapshot-preview1", ] -[[package]] -name = "gimli" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" - [[package]] name = "h2" version = "0.2.7" @@ -1378,15 +1203,6 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" -[[package]] -name = "lock_api" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" -dependencies = [ - "scopeguard", -] - [[package]] name = "lock_api" version = "0.4.3" @@ -1604,16 +1420,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "num-integer" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" -dependencies = [ - "autocfg", - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.14" @@ -1633,12 +1439,6 @@ dependencies = [ "libc", ] -[[package]] -name = "object" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" - [[package]] name = "once_cell" version = "1.7.2" @@ -1690,16 +1490,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "parking_lot" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" -dependencies = [ - "lock_api 0.3.4", - "parking_lot_core 0.7.2", -] - [[package]] name = "parking_lot" version = "0.11.1" @@ -1707,22 +1497,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" dependencies = [ "instant", - "lock_api 0.4.3", - "parking_lot_core 0.8.3", -] - -[[package]] -name = "parking_lot_core" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" -dependencies = [ - "cfg-if 0.1.10", - "cloudabi", - "libc", - "redox_syscall 0.1.57", - "smallvec", - "winapi 0.3.9", + "lock_api", + "parking_lot_core", ] [[package]] @@ -1734,7 +1510,7 @@ dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall 0.2.6", + "redox_syscall", "smallvec", "winapi 0.3.9", ] @@ -1897,7 +1673,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff3e0f70d32e20923cabf2df02913be7c1842d4c772db8065c00fcfdd1d1bff3" dependencies = [ - "base64 0.13.0", + "base64", "byteorder", "bytes 1.0.1", "fallible-iterator", @@ -1920,7 +1696,7 @@ dependencies = [ "postgres-protocol", "serde", "serde_json", - "time 0.2.26", + "time", "uuid", ] @@ -1973,7 +1749,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "545c5bc2b880973c9c10e4067418407a0ccaa3091781d1671d46eb35107cb26f" dependencies = [ "log", - "parking_lot 0.11.1", + "parking_lot", "scheduled-thread-pool", ] @@ -2093,12 +1869,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - [[package]] name = "redox_syscall" version = "0.2.6" @@ -2143,16 +1913,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "resolv-conf" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11834e137f3b14e309437a8276714eed3a80d1ef894869e510f2c0c0b98b9f4a" -dependencies = [ - "hostname", - "quick-error", -] - [[package]] name = "resolv-conf" version = "0.7.0" @@ -2163,12 +1923,6 @@ dependencies = [ "quick-error", ] -[[package]] -name = "rustc-demangle" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" - [[package]] name = "rustc_version" version = "0.2.3" @@ -2209,7 +1963,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc6f74fd1204073fa02d5d5d68bec8021be4c38690b61264b2fdb48083d0e7d7" dependencies = [ - "parking_lot 0.11.1", + "parking_lot", ] [[package]] @@ -2315,18 +2069,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_urlencoded" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" -dependencies = [ - "dtoa", - "itoa", - "serde", - "url", -] - [[package]] name = "serde_urlencoded" version = "0.7.0" @@ -2522,18 +2264,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "synstructure" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "unicode-xid", -] - [[package]] name = "tempfile" version = "3.2.0" @@ -2543,7 +2273,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "rand 0.8.3", - "redox_syscall 0.2.6", + "redox_syscall", "remove_dir_all", "winapi 0.3.9", ] @@ -2605,17 +2335,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "time" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi 0.3.9", -] - [[package]] name = "time" version = "0.2.26" @@ -2736,7 +2455,7 @@ dependencies = [ "fallible-iterator", "futures", "log", - "parking_lot 0.11.1", + "parking_lot", "percent-encoding", "phf", "pin-project-lite 0.2.6", @@ -2747,20 +2466,6 @@ dependencies = [ "tokio-util 0.6.6", ] -[[package]] -name = "tokio-util" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930" -dependencies = [ - "bytes 0.5.6", - "futures-core", - "futures-sink", - "log", - "pin-project-lite 0.1.12", - "tokio 0.2.25", -] - [[package]] name = "tokio-util" version = "0.3.1" @@ -2769,6 +2474,7 @@ checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" dependencies = [ "bytes 0.5.6", "futures-core", + "futures-io", "futures-sink", "log", "pin-project-lite 0.1.12", @@ -2820,26 +2526,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "trust-dns-proto" -version = "0.18.0-alpha.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a7f3a2ab8a919f5eca52a468866a67ed7d3efa265d48a652a9a3452272b413f" -dependencies = [ - "async-trait", - "enum-as-inner", - "failure", - "futures", - "idna", - "lazy_static", - "log", - "rand 0.7.3", - "smallvec", - "socket2 0.3.19", - "tokio 0.2.25", - "url", -] - [[package]] name = "trust-dns-proto" version = "0.19.7" @@ -2860,25 +2546,6 @@ dependencies = [ "url", ] -[[package]] -name = "trust-dns-resolver" -version = "0.18.0-alpha.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f90b1502b226f8b2514c6d5b37bafa8c200d7ca4102d57dc36ee0f3b7a04a2f" -dependencies = [ - "cfg-if 0.1.10", - "failure", - "futures", - "ipconfig", - "lazy_static", - "log", - "lru-cache", - "resolv-conf 0.6.3", - "smallvec", - "tokio 0.2.25", - "trust-dns-proto 0.18.0-alpha.2", -] - [[package]] name = "trust-dns-resolver" version = "0.19.7" @@ -2891,11 +2558,11 @@ dependencies = [ "lazy_static", "log", "lru-cache", - "resolv-conf 0.7.0", + "resolv-conf", "smallvec", "thiserror", "tokio 0.2.25", - "trust-dns-proto 0.19.7", + "trust-dns-proto", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 0c790e49..dd4f8a16 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ name = "martin" path = "src/bin/main.rs" [dependencies] -actix = "0.9" +actix = "0.10" actix-cors = "0.5.4" actix-rt = "1.1" actix-web = "3.3.2"