Remove tokio 1.5 from dependencies

This commit is contained in:
silverpill 2021-11-20 22:04:19 +00:00
parent 22fa619a16
commit 86749a6ca1
2 changed files with 24 additions and 56 deletions

76
Cargo.lock generated
View file

@ -14,7 +14,7 @@ dependencies = [
"futures-sink", "futures-sink",
"log", "log",
"pin-project 0.4.28", "pin-project 0.4.28",
"tokio 0.2.25", "tokio",
"tokio-util", "tokio-util",
] ]
@ -73,9 +73,9 @@ dependencies = [
[[package]] [[package]]
name = "actix-http" name = "actix-http"
version = "2.2.0" version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "452299e87817ae5673910e53c243484ca38be3828db819b6011736fc6982e874" checksum = "5cb8958da437716f3f31b0e76f8daf36554128517d7df37ceba7df00f09622ee"
dependencies = [ dependencies = [
"actix-codec", "actix-codec",
"actix-connect", "actix-connect",
@ -153,7 +153,7 @@ dependencies = [
"futures-channel", "futures-channel",
"futures-util", "futures-util",
"smallvec", "smallvec",
"tokio 0.2.25", "tokio",
] ]
[[package]] [[package]]
@ -711,16 +711,6 @@ dependencies = [
"maybe-uninit", "maybe-uninit",
] ]
[[package]]
name = "crossbeam-queue"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f6cb3c7f5b8e51bc3ebb73a2327ad4abdbd119dc13223f14f961d2f38486756"
dependencies = [
"cfg-if 1.0.0",
"crossbeam-utils 0.8.3",
]
[[package]] [[package]]
name = "crossbeam-utils" name = "crossbeam-utils"
version = "0.7.2" version = "0.7.2"
@ -775,25 +765,13 @@ name = "deadpool"
version = "0.5.2" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4aaff9a7a1de9893f4004fa08527b31cb2ae4121c44e053cf53f29203c73bd23" checksum = "4aaff9a7a1de9893f4004fa08527b31cb2ae4121c44e053cf53f29203c73bd23"
dependencies = [
"async-trait",
"crossbeam-queue 0.2.3",
"num_cpus",
"tokio 0.2.25",
]
[[package]]
name = "deadpool"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d126179d86aee4556e54f5f3c6bf6d9884e7cc52cef82f77ee6f90a7747616d"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"config", "config",
"crossbeam-queue 0.3.1", "crossbeam-queue",
"num_cpus", "num_cpus",
"serde", "serde",
"tokio 1.5.0", "tokio",
] ]
[[package]] [[package]]
@ -803,10 +781,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "faad41e7f93dd682108c72aec029e5bc6238e7df64c9d84832525d4033d2e726" checksum = "faad41e7f93dd682108c72aec029e5bc6238e7df64c9d84832525d4033d2e726"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"deadpool 0.5.2", "deadpool",
"futures", "futures",
"log", "log",
"tokio 0.2.25", "tokio",
"tokio-postgres", "tokio-postgres",
] ]
@ -1184,7 +1162,7 @@ dependencies = [
"http", "http",
"indexmap", "indexmap",
"slab", "slab",
"tokio 0.2.25", "tokio",
"tokio-util", "tokio-util",
"tracing", "tracing",
"tracing-futures", "tracing-futures",
@ -1306,7 +1284,7 @@ dependencies = [
"itoa", "itoa",
"pin-project 1.0.6", "pin-project 1.0.6",
"socket2", "socket2",
"tokio 0.2.25", "tokio",
"tower-service", "tower-service",
"tracing", "tracing",
"want", "want",
@ -1324,7 +1302,7 @@ dependencies = [
"hyper", "hyper",
"hyper-tls", "hyper-tls",
"native-tls", "native-tls",
"tokio 0.2.25", "tokio",
"tokio-tls", "tokio-tls",
"tower-service", "tower-service",
"typed-headers", "typed-headers",
@ -1339,7 +1317,7 @@ dependencies = [
"bytes 0.5.6", "bytes 0.5.6",
"hyper", "hyper",
"native-tls", "native-tls",
"tokio 0.2.25", "tokio",
"tokio-tls", "tokio-tls",
] ]
@ -1714,7 +1692,7 @@ dependencies = [
"base64 0.13.0", "base64 0.13.0",
"chrono", "chrono",
"clap", "clap",
"deadpool 0.7.0", "deadpool",
"deadpool-postgres", "deadpool-postgres",
"dotenv", "dotenv",
"env_logger", "env_logger",
@ -1737,7 +1715,7 @@ dependencies = [
"serde_yaml", "serde_yaml",
"sha2", "sha2",
"thiserror", "thiserror",
"tokio 0.2.25", "tokio",
"tokio-postgres", "tokio-postgres",
"url 2.2.2", "url 2.2.2",
"uuid", "uuid",
@ -2542,7 +2520,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"serde_urlencoded", "serde_urlencoded",
"tokio 0.2.25", "tokio",
"tokio-tls", "tokio-tls",
"url 2.2.2", "url 2.2.2",
"wasm-bindgen", "wasm-bindgen",
@ -3144,16 +3122,6 @@ dependencies = [
"winapi 0.3.9", "winapi 0.3.9",
] ]
[[package]]
name = "tokio"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83f0c8e7c0addab50b663055baf787d0af7f413a46e6e7fb9559a4e4db7137a5"
dependencies = [
"autocfg 1.0.1",
"pin-project-lite 0.2.6",
]
[[package]] [[package]]
name = "tokio-macros" name = "tokio-macros"
version = "0.2.6" version = "0.2.6"
@ -3183,7 +3151,7 @@ dependencies = [
"pin-project-lite 0.1.12", "pin-project-lite 0.1.12",
"postgres-protocol", "postgres-protocol",
"postgres-types", "postgres-types",
"tokio 0.2.25", "tokio",
"tokio-util", "tokio-util",
] ]
@ -3194,7 +3162,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343"
dependencies = [ dependencies = [
"native-tls", "native-tls",
"tokio 0.2.25", "tokio",
] ]
[[package]] [[package]]
@ -3208,7 +3176,7 @@ dependencies = [
"futures-sink", "futures-sink",
"log", "log",
"pin-project-lite 0.1.12", "pin-project-lite 0.1.12",
"tokio 0.2.25", "tokio",
] ]
[[package]] [[package]]
@ -3273,7 +3241,7 @@ dependencies = [
"rand 0.7.3", "rand 0.7.3",
"smallvec", "smallvec",
"thiserror", "thiserror",
"tokio 0.2.25", "tokio",
"url 2.2.2", "url 2.2.2",
] ]
@ -3292,7 +3260,7 @@ dependencies = [
"resolv-conf", "resolv-conf",
"smallvec", "smallvec",
"thiserror", "thiserror",
"tokio 0.2.25", "tokio",
"trust-dns-proto", "trust-dns-proto",
] ]
@ -3724,9 +3692,9 @@ dependencies = [
[[package]] [[package]]
name = "zeroize_derive" name = "zeroize_derive"
version = "1.1.0" version = "1.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2c1e130bebaeab2f23886bf9acbaca14b092408c452543c857f66399cd6dab1" checksum = "65f1a51723ec88c66d5d1fe80c841f17f63587d6691901d66be9bec6c3b51f73"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",

View file

@ -26,8 +26,8 @@ chrono = { version = "0.4.19", features = ["serde"] }
# Used to build admin CLI tool # Used to build admin CLI tool
# Versions greater than beta.2 require Rust 1.54 # Versions greater than beta.2 require Rust 1.54
clap = { version = "3.0.0-beta.2", default-features = false, features = ["std", "derive"] } clap = { version = "3.0.0-beta.2", default-features = false, features = ["std", "derive"] }
# Used for pooling database connections # Used for pooling database connections (compatible with tokio 0.2)
deadpool = "0.7.0" deadpool = "0.5.2"
deadpool-postgres = { version = "0.5.6", default-features = false } deadpool-postgres = { version = "0.5.6", default-features = false }
# Used to read .env files # Used to read .env files
dotenv = "0.15.0" dotenv = "0.15.0"