From e93588a6d99746b40de2b8be2a5de71f99a03199 Mon Sep 17 00:00:00 2001 From: Valentin Brandl Date: Fri, 26 Feb 2021 15:51:35 +0100 Subject: [PATCH] Revert "Bump actix-rt from 1.1.1 to 2.1.0" --- Cargo.lock | 110 ++++++++++------------------------------------------- Cargo.toml | 2 +- 2 files changed, 22 insertions(+), 90 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e47186e..96ff9fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -44,7 +44,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "177837a10863f15ba8d3ae3ec12fac1099099529ed20083a27fdfe247381d0dc" dependencies = [ "actix-codec 0.3.0", - "actix-rt 1.1.1", + "actix-rt", "actix-service", "actix-utils 2.0.0", "derive_more", @@ -64,7 +64,7 @@ checksum = "452299e87817ae5673910e53c243484ca38be3828db819b6011736fc6982e874" dependencies = [ "actix-codec 0.3.0", "actix-connect", - "actix-rt 1.1.1", + "actix-rt", "actix-service", "actix-threadpool", "actix-utils 2.0.0", @@ -113,16 +113,6 @@ dependencies = [ "syn", ] -[[package]] -name = "actix-macros" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbcb2b608f0accc2f5bcf3dd872194ce13d94ee45b571487035864cf966b04ef" -dependencies = [ - "quote", - "syn", -] - [[package]] name = "actix-router" version = "0.2.4" @@ -142,7 +132,7 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "143fcc2912e0d1de2bcf4e2f720d2a60c28652ab4179685a1ee159e0fb3db227" dependencies = [ - "actix-macros 0.1.1", + "actix-macros", "actix-threadpool", "copyless", "futures-channel", @@ -151,17 +141,6 @@ dependencies = [ "tokio 0.2.22", ] -[[package]] -name = "actix-rt" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b4e57bc1a3915e71526d128baf4323700bd1580bc676239e2298a4c5b001f18" -dependencies = [ - "actix-macros 0.2.0", - "futures-core", - "tokio 1.2.0", -] - [[package]] name = "actix-server" version = "1.0.1" @@ -169,7 +148,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d3455eaac03ca3e49d7b822eb35c884b861f715627254ccbe4309d08f1841a" dependencies = [ "actix-codec 0.2.0", - "actix-rt 1.1.1", + "actix-rt", "actix-service", "actix-utils 1.0.6", "futures", @@ -197,8 +176,8 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48494745b72d0ea8ff0cf874aaf9b622a3ee03d7081ee0c04edea4f26d32c911" dependencies = [ - "actix-macros 0.1.1", - "actix-rt 1.1.1", + "actix-macros", + "actix-rt", "actix-server", "actix-service", "futures", @@ -217,7 +196,7 @@ dependencies = [ "lazy_static", "log", "num_cpus", - "parking_lot 0.10.0", + "parking_lot", "threadpool", ] @@ -240,7 +219,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcf8f5631bf01adec2267808f00e228b761c60c0584cc9fa0b5364f41d147f4e" dependencies = [ "actix-codec 0.2.0", - "actix-rt 1.1.1", + "actix-rt", "actix-service", "bitflags", "bytes 0.5.6", @@ -258,7 +237,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e9022dec56632d1d7979e59af14f0597a28a830a9c1c7fec8b2327eb9f16b5a" dependencies = [ "actix-codec 0.3.0", - "actix-rt 1.1.1", + "actix-rt", "actix-service", "bitflags", "bytes 0.5.6", @@ -279,9 +258,9 @@ checksum = "e641d4a172e7faa0862241a20ff4f1f5ab0ab7c279f00c2d4587b77483477b86" dependencies = [ "actix-codec 0.3.0", "actix-http", - "actix-macros 0.1.1", + "actix-macros", "actix-router", - "actix-rt 1.1.1", + "actix-rt", "actix-server", "actix-service", "actix-testing", @@ -385,7 +364,7 @@ checksum = "b381e490e7b0cfc37ebc54079b0413d8093ef43d14a4e4747083f7fa47a9e691" dependencies = [ "actix-codec 0.3.0", "actix-http", - "actix-rt 1.1.1", + "actix-rt", "actix-service", "base64 0.13.0", "bytes 0.5.6", @@ -991,7 +970,7 @@ dependencies = [ name = "hoc" version = "0.16.0" dependencies = [ - "actix-rt 2.1.0", + "actix-rt", "actix-web", "badge", "bytes 1.0.1", @@ -1115,15 +1094,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "instant" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" -dependencies = [ - "cfg-if 1.0.0", -] - [[package]] name = "iovec" version = "0.1.4" @@ -1290,15 +1260,6 @@ dependencies = [ "scopeguard", ] -[[package]] -name = "lock_api" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" -dependencies = [ - "scopeguard", -] - [[package]] name = "log" version = "0.4.11" @@ -1538,9 +1499,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "once_cell" -version = "1.7.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10acf907b94fc1b1a152d08ef97e7759650268cf986bf127f387e602b02c7e5a" +checksum = "b1c601810575c99596d4afc46f78a678c80105117c379eb3650cf99b8a21ce5b" [[package]] name = "opaque-debug" @@ -1596,19 +1557,8 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc" dependencies = [ - "lock_api 0.3.3", - "parking_lot_core 0.7.0", -] - -[[package]] -name = "parking_lot" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" -dependencies = [ - "instant", - "lock_api 0.4.2", - "parking_lot_core 0.8.3", + "lock_api", + "parking_lot_core", ] [[package]] @@ -1625,20 +1575,6 @@ dependencies = [ "winapi 0.3.8", ] -[[package]] -name = "parking_lot_core" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" -dependencies = [ - "cfg-if 1.0.0", - "instant", - "libc", - "redox_syscall 0.2.4", - "smallvec", - "winapi 0.3.8", -] - [[package]] name = "percent-encoding" version = "2.1.0" @@ -1744,9 +1680,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.9" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" dependencies = [ "proc-macro2", ] @@ -2154,9 +2090,9 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" [[package]] name = "smallvec" -version = "1.6.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +checksum = "3757cb9d89161a2f24e1cf78efa0c1fcff485d18e3f55e0aa3480824ddaa0f3f" [[package]] name = "socket2" @@ -2390,11 +2326,7 @@ dependencies = [ "libc", "memchr", "mio 0.7.7", - "once_cell", - "parking_lot 0.11.1", "pin-project-lite 0.2.0", - "signal-hook-registry", - "winapi 0.3.8", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 62d1316..40e6398 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" build = "build.rs" [dependencies] -actix-rt = "2.1.0" +actix-rt = "1.1.1" actix-web = "3.3.2" badge = "0.3.0" bytes = "1.0.1"