diff --git a/Cargo.lock b/Cargo.lock index 39275cc..22c8c47 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -125,7 +125,7 @@ dependencies = [ "futures-util", "log", "pin-project 1.0.2", - "tokio", + "tokio 0.2.24", "tokio-rustls", "tungstenite 0.11.1", "webpki-roots", @@ -628,7 +628,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "tokio", + "tokio 1.0.2", ] [[package]] @@ -813,7 +813,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "tokio", + "tokio 0.2.24", "tokio-tungstenite", "tungstenite 0.10.1", "url", @@ -973,7 +973,7 @@ dependencies = [ "http", "indexmap", "slab", - "tokio", + "tokio 0.2.24", "tokio-util", "tracing", "tracing-futures", @@ -1058,7 +1058,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "tokio", + "tokio 0.2.24", ] [[package]] @@ -1085,7 +1085,7 @@ dependencies = [ "itoa", "pin-project 1.0.2", "socket2", - "tokio", + "tokio 0.2.24", "tower-service", "tracing", "want", @@ -1102,7 +1102,7 @@ dependencies = [ "hyper", "log", "rustls", - "tokio", + "tokio 0.2.24", "tokio-rustls", "webpki", ] @@ -1116,7 +1116,7 @@ dependencies = [ "bytes", "hyper", "native-tls", - "tokio", + "tokio 0.2.24", "tokio-tls", ] @@ -1921,7 +1921,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "tokio", + "tokio 0.2.24", "tokio-rustls", "tokio-tls", "url", @@ -2023,7 +2023,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71ce7eac2075a4562fbcbad544cd55d72ebc760e0a5594a7c8829cf2b4b42a7a" dependencies = [ - "tokio", + "tokio 0.2.24", "tokio-util", ] @@ -2161,7 +2161,7 @@ dependencies = [ "serde", "serde_json", "static_assertions", - "tokio", + "tokio 0.2.24", "tracing", "tracing-futures", "typemap_rev", @@ -2240,7 +2240,7 @@ dependencies = [ "easy-parallel", "futures-lite", "num_cpus", - "tokio", + "tokio 0.2.24", ] [[package]] @@ -2392,9 +2392,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "0.2.23" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6d7ad61edd59bfcc7e80dababf0f4aed2e6d5e0ba1659356ae889752dfc12ff" +checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48" dependencies = [ "bytes", "fnv", @@ -2408,7 +2408,18 @@ dependencies = [ "num_cpus", "pin-project-lite 0.1.11", "slab", - "tokio-macros", + "tokio-macros 0.2.6", +] + +[[package]] +name = "tokio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca04cec6ff2474c638057b65798f60ac183e5e79d3448bb7163d36a39cff6ec" +dependencies = [ + "autocfg", + "pin-project-lite 0.2.0", + "tokio-macros 1.0.0", ] [[package]] @@ -2422,6 +2433,17 @@ dependencies = [ "syn", ] +[[package]] +name = "tokio-macros" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42517d2975ca3114b22a16192634e8241dc5cc1f130be194645970cc1c371494" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "tokio-rustls" version = "0.14.1" @@ -2430,7 +2452,7 @@ checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a" dependencies = [ "futures-core", "rustls", - "tokio", + "tokio 0.2.24", "webpki", ] @@ -2441,7 +2463,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio", + "tokio 0.2.24", ] [[package]] @@ -2454,7 +2476,7 @@ dependencies = [ "log", "native-tls", "pin-project 0.4.27", - "tokio", + "tokio 0.2.24", "tokio-tls", "tungstenite 0.10.1", ] @@ -2470,7 +2492,7 @@ dependencies = [ "futures-sink", "log", "pin-project-lite 0.1.11", - "tokio", + "tokio 0.2.24", ] [[package]] @@ -2927,7 +2949,7 @@ dependencies = [ "serenity", "six_e", "systemd", - "tokio", + "tokio 1.0.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index d563cb4..22a55e9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ reqwest = { version = "0.10", features = ["json"] } systemd = "0.8" sdnotify = "0.1" serde = { version = "1", features = ["derive"] } -tokio = { version = "0.2", features = ["macros"] } +tokio = { version = "1.0", features = ["macros"] } # in-repo packages discord_webhook = { path = "./discord_webhook" } diff --git a/discord_webhook/Cargo.toml b/discord_webhook/Cargo.toml index 2f18b7c..1d9f3f9 100644 --- a/discord_webhook/Cargo.toml +++ b/discord_webhook/Cargo.toml @@ -14,4 +14,4 @@ serde_json = "1" [dev-dependencies] anyhow = "1" httptest = "0" -tokio = { version = "0.2", features = ["macros"] } \ No newline at end of file +tokio = { version = "1.0", features = ["macros"] } \ No newline at end of file