diff --git a/Cargo.lock b/Cargo.lock index c7cc2cfcc..abb70acc1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -91,7 +91,7 @@ version = "0.2.1" dependencies = [ "all-is-cubes", "static_dir", - "tokio", + "tokio 1.5.0", "warp", ] @@ -760,7 +760,7 @@ dependencies = [ "http", "indexmap", "slab", - "tokio", + "tokio 0.2.25", "tokio-util", "tracing", "tracing-futures", @@ -872,7 +872,7 @@ dependencies = [ "itoa", "pin-project 1.0.6", "socket2", - "tokio", + "tokio 0.2.25", "tower-service", "tracing", "want", @@ -2129,14 +2129,24 @@ dependencies = [ "mio 0.6.23", "pin-project-lite 0.1.12", "slab", +] + +[[package]] +name = "tokio" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83f0c8e7c0addab50b663055baf787d0af7f413a46e6e7fb9559a4e4db7137a5" +dependencies = [ + "autocfg", + "pin-project-lite 0.2.6", "tokio-macros", ] [[package]] name = "tokio-macros" -version = "0.2.6" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" +checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57" dependencies = [ "proc-macro2", "quote", @@ -2152,7 +2162,7 @@ dependencies = [ "futures-util", "log", "pin-project 0.4.27", - "tokio", + "tokio 0.2.25", "tungstenite", ] @@ -2167,7 +2177,7 @@ dependencies = [ "futures-sink", "log", "pin-project-lite 0.1.12", - "tokio", + "tokio 0.2.25", ] [[package]] @@ -2369,7 +2379,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "tokio", + "tokio 0.2.25", "tokio-tungstenite", "tower-service", "tracing", diff --git a/all-is-cubes-server/Cargo.toml b/all-is-cubes-server/Cargo.toml index ce738c5c4..22ff2c625 100644 --- a/all-is-cubes-server/Cargo.toml +++ b/all-is-cubes-server/Cargo.toml @@ -23,5 +23,5 @@ test = false # any testable code will be in lib [dependencies] all-is-cubes = { path = "../all-is-cubes", version = "0.2.0", features = ["rayon"] } static_dir = "0.1.3" -tokio = { version = "0.2.22", features = ["macros"] } +tokio = { version = "1.5.0", features = ["macros"] } warp = "0.2.5"