diff --git a/Cargo.lock b/Cargo.lock index 64d702f0645..7b0609b7279 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -216,7 +216,7 @@ dependencies = [ "futures-core", "memchr", "pin-project-lite", - "tokio 1.38.1", + "tokio 1.39.2", ] [[package]] @@ -242,7 +242,7 @@ dependencies = [ "pin-project-lite", "rustls-native-certs", "rustls-pki-types", - "tokio 1.38.1", + "tokio 1.39.2", "tokio-rustls 0.25.0", "tungstenite", ] @@ -2310,7 +2310,7 @@ dependencies = [ "itoa", "pin-project-lite", "smallvec 1.13.2", - "tokio 1.38.1", + "tokio 1.39.2", "want", ] @@ -2326,7 +2326,7 @@ dependencies = [ "hyper-util", "rustls 0.23.11", "rustls-pki-types", - "tokio 1.38.1", + "tokio 1.39.2", "tokio-rustls 0.26.0", "tower-service", "webpki-roots", @@ -2343,7 +2343,7 @@ dependencies = [ "hyper", "hyper-util", "native-tls", - "tokio 1.38.1", + "tokio 1.39.2", "tokio-native-tls", "tower-service", ] @@ -2358,7 +2358,7 @@ dependencies = [ "hyper", "hyper-util", "pin-project-lite", - "tokio 1.38.1", + "tokio 1.39.2", "tokio-tungstenite", "tungstenite", ] @@ -2376,8 +2376,8 @@ dependencies = [ "http-body", "hyper", "pin-project-lite", - "socket2 0.5.7", - "tokio 1.38.1", + "socket2", + "tokio 1.39.2", "tower", "tower-service", "tracing", @@ -3077,14 +3077,15 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi", "libc", "log 0.4.22", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3819,7 +3820,7 @@ dependencies = [ "rustc-hash", "rustls 0.23.11", "thiserror", - "tokio 1.38.1", + "tokio 1.39.2", "tracing", ] @@ -3848,7 +3849,7 @@ checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" dependencies = [ "libc", "once_cell", - "socket2 0.5.7", + "socket2", "windows-sys 0.52.0", ] @@ -4091,7 +4092,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "sync_wrapper", - "tokio 1.38.1", + "tokio 1.39.2", "tokio-native-tls", "tokio-rustls 0.26.0", "tokio-socks", @@ -4840,16 +4841,6 @@ dependencies = [ "managed", ] -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi 0.3.9", -] - [[package]] name = "socket2" version = "0.5.7" @@ -5226,20 +5217,19 @@ dependencies = [ [[package]] name = "tokio" -version = "1.38.1" +version = "1.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" dependencies = [ "backtrace", "bytes 1.6.1", "libc", - "mio 0.8.11", - "num_cpus", + "mio 1.0.1", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.7", + "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -5316,9 +5306,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", @@ -5332,7 +5322,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", - "tokio 1.38.1", + "tokio 1.39.2", ] [[package]] @@ -5362,7 +5352,7 @@ checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ "rustls 0.22.4", "rustls-pki-types", - "tokio 1.38.1", + "tokio 1.39.2", ] [[package]] @@ -5373,7 +5363,7 @@ checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ "rustls 0.23.11", "rustls-pki-types", - "tokio 1.38.1", + "tokio 1.39.2", ] [[package]] @@ -5403,7 +5393,7 @@ dependencies = [ "either", "futures-util", "thiserror", - "tokio 1.38.1", + "tokio 1.39.2", ] [[package]] @@ -5414,7 +5404,7 @@ checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", - "tokio 1.38.1", + "tokio 1.39.2", "tokio-util", ] @@ -5482,7 +5472,7 @@ dependencies = [ "rustls 0.22.4", "rustls-native-certs", "rustls-pki-types", - "tokio 1.38.1", + "tokio 1.39.2", "tokio-rustls 0.25.0", "tungstenite", "webpki-roots", @@ -5531,7 +5521,7 @@ dependencies = [ "futures-core", "futures-sink", "pin-project-lite", - "tokio 1.38.1", + "tokio 1.39.2", ] [[package]] @@ -5613,7 +5603,7 @@ dependencies = [ "futures-util", "pin-project", "pin-project-lite", - "tokio 1.38.1", + "tokio 1.39.2", "tower-layer", "tower-service", "tracing", @@ -6030,7 +6020,7 @@ dependencies = [ "slab", "tempfile", "thiserror", - "tokio 1.38.1", + "tokio 1.39.2", "tracing", "tracing-test", "typetag", @@ -6045,9 +6035,9 @@ dependencies = [ "bytes 1.6.1", "derivative", "futures 0.3.30", - "mio 0.8.11", + "mio 1.0.1", "serde", - "socket2 0.4.10", + "socket2", "thiserror", "tracing", ] @@ -6068,15 +6058,15 @@ dependencies = [ "hyper-tungstenite", "hyper-util", "libc", - "mio 0.8.11", + "mio 1.0.1", "pin-project-lite", "rkyv", "serde", "serial_test", "smoltcp", - "socket2 0.4.10", + "socket2", "thiserror", - "tokio 1.38.1", + "tokio 1.39.2", "tokio-serde", "tokio-tungstenite", "tokio-util", @@ -6482,7 +6472,7 @@ dependencies = [ "serde_json", "serde_path_to_error", "time 0.3.36", - "tokio 1.38.1", + "tokio 1.39.2", "tracing", "url", "uuid", @@ -6506,7 +6496,7 @@ dependencies = [ "serde", "serde_json", "shared-buffer", - "tokio 1.38.1", + "tokio 1.39.2", "tracing", "tracing-subscriber", "url", @@ -6544,7 +6534,7 @@ dependencies = [ "libc", "paste", "thiserror", - "tokio 1.38.1", + "tokio 1.39.2", "tracing", "tracing-subscriber", "typetag", @@ -6641,7 +6631,7 @@ dependencies = [ "libc", "log 0.4.22", "mac_address", - "mio 0.8.11", + "mio 1.0.1", "normpath", "object 0.32.2", "once_cell", @@ -6666,7 +6656,7 @@ dependencies = [ "time 0.1.45", "time 0.3.36", "tldextract", - "tokio 1.38.1", + "tokio 1.39.2", "tokio-tungstenite", "toml 0.5.11", "tracing", @@ -6711,7 +6701,7 @@ dependencies = [ "lazy_static", "leb128", "libc", - "memmap2 0.5.10", + "memmap2 0.6.2", "more-asserts", "region", "rkyv", @@ -6933,7 +6923,7 @@ dependencies = [ "tar", "target-lexicon 0.12.15", "tempfile", - "tokio 1.38.1", + "tokio 1.39.2", "wasmer-registry", ] @@ -7023,7 +7013,7 @@ dependencies = [ "thiserror", "time 0.3.36", "tldextract", - "tokio 1.38.1", + "tokio 1.39.2", "tokio-tungstenite", "toml 0.5.11", "tracing", @@ -7151,7 +7141,7 @@ dependencies = [ "terminal_size", "termios", "thiserror", - "tokio 1.38.1", + "tokio 1.39.2", "tokio-stream", "tower", "tower-http", @@ -7228,7 +7218,7 @@ dependencies = [ "serde", "tempfile", "thiserror", - "tokio 1.38.1", + "tokio 1.39.2", "virtual-fs", "wasmer", "wasmer-types", @@ -7257,7 +7247,7 @@ dependencies = [ "tempfile", "test-generator", "test-log", - "tokio 1.38.1", + "tokio 1.39.2", "tracing", "tracing-subscriber", "ureq", @@ -7380,7 +7370,7 @@ dependencies = [ "http 0.2.12", "schemars", "serde", - "tokio 1.38.1", + "tokio 1.39.2", "wasmparser 0.95.0", "wcgi 0.1.2", ] @@ -7393,7 +7383,7 @@ checksum = "1cfc134be64da186b33675e0154827ba8eb4eb30579c1142cebec88607cd2cf6" dependencies = [ "http 1.1.0", "serde", - "tokio 1.38.1", + "tokio 1.39.2", "wasmparser 0.95.0", "wcgi 0.2.0", ] diff --git a/Cargo.toml b/Cargo.toml index 324c5008164..548c7d20f9d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ wasmer-middlewares = { version = "=4.3.5", path = "lib/middlewares", optional = # Third party dependencies cfg-if = "1.0" -tokio = { version = "1", features = [ +tokio = { version = "1.39", features = [ "rt", "rt-multi-thread", "macros", @@ -75,6 +75,9 @@ members = [ "tests/wasi-wast", "tests/wasmer-argus", ] +exclude = [ + "./lib/cli/tests/packages/axum" +] resolver = "2" [workspace.package] @@ -109,6 +112,10 @@ toml = {version = "0.5.9", features = ["preserve_order"]} indexmap = "2" serde_yaml = "0.9.34" libc = { version = "^0.2", default-features = false } +mio = "1" +# MIO 1.0 starts at tokio version 1.39, hence the minimum requirement. +tokio = { version = "1.39.0", default-features = false} +socket2 = "0.5.7" [build-dependencies] test-generator = { path = "tests/lib/test-generator" } diff --git a/lib/backend-api/Cargo.toml b/lib/backend-api/Cargo.toml index 8d4120c1a7b..2143e06dc92 100644 --- a/lib/backend-api/Cargo.toml +++ b/lib/backend-api/Cargo.toml @@ -23,7 +23,7 @@ webc.workspace = true anyhow = "1" serde = { version = "1", features = ["derive"] } time = { version = "0.3", features = ["formatting", "parsing"] } -tokio = { version = "1.23.0" } +tokio = { workspace = true } serde_json = "1" url = "2" futures = "0.3" @@ -41,5 +41,5 @@ features = ["js"] [dev-dependencies] base64 = "0.13.1" -tokio = { version = "1.3", features = ["macros", "rt"] } +tokio = { workspace = true, features = ["macros", "rt"] } uuid = { version = "1", features = ["v4"] } diff --git a/lib/c-api/Cargo.toml b/lib/c-api/Cargo.toml index b22a6c79801..b264889b022 100644 --- a/lib/c-api/Cargo.toml +++ b/lib/c-api/Cargo.toml @@ -42,7 +42,7 @@ libc.workspace = true thiserror = "1" typetag = { version = "0.1", optional = true } paste = "1.0" -tokio = { version = "1", features = [ "rt", "rt-multi-thread", "io-util", "sync", "macros"], default-features = false } +tokio = { workspace = true, features = [ "rt", "rt-multi-thread", "io-util", "sync", "macros"], default-features = false } tracing = { version = "0.1" } tracing-subscriber = { version = "0.3", features = [ "env-filter", diff --git a/lib/cli/Cargo.toml b/lib/cli/Cargo.toml index 18d3beecc9e..b382c9d3556 100644 --- a/lib/cli/Cargo.toml +++ b/lib/cli/Cargo.toml @@ -202,7 +202,7 @@ tracing-subscriber = { version = "0.3", features = [ "json", ] } async-trait = "0.1.68" -tokio = { version = "1.28.1", features = ["macros", "rt-multi-thread"] } +tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } once_cell = "1.17.1" indicatif = "0.17.5" opener = "0.6.1" @@ -222,7 +222,7 @@ comfy-table = "7.0.1" # Used by tuntap and connect futures-util = "0.3" -mio = { version = "0.8", optional = true } +mio = { workspace = true, optional = true } tokio-tungstenite = { version = "0.21.0", features = [ "rustls-tls-webpki-roots", "stream", diff --git a/lib/compiler/Cargo.toml b/lib/compiler/Cargo.toml index ce9d426d611..1cf88543467 100644 --- a/lib/compiler/Cargo.toml +++ b/lib/compiler/Cargo.toml @@ -25,7 +25,7 @@ smallvec = "1.6" xxhash-rust = { version = "0.8.10", features = ["xxh64"] } backtrace = "0.3" -memmap2 = "0.5" +memmap2 = "0.6" more-asserts = "0.2" lazy_static = "1.4" diff --git a/lib/registry/Cargo.toml b/lib/registry/Cargo.toml index 92fef924477..5b52e84e119 100644 --- a/lib/registry/Cargo.toml +++ b/lib/registry/Cargo.toml @@ -44,7 +44,7 @@ tempfile = "3.6.0" thiserror = "1.0.37" time = { version = "0.3.17", default-features = false, features = ["parsing", "std", "formatting"], optional = true } tldextract = "0.6.0" -tokio = {version = "1", features = ["rt-multi-thread"]} +tokio = { workspace = true, features = ["rt-multi-thread"] } tokio-tungstenite = {version = "0.21", features = ["rustls-tls-native-roots"]} toml.workspace = true tracing = "0.1.40" diff --git a/lib/virtual-fs/Cargo.toml b/lib/virtual-fs/Cargo.toml index f6db418f880..1a4d333cdf1 100644 --- a/lib/virtual-fs/Cargo.toml +++ b/lib/virtual-fs/Cargo.toml @@ -26,7 +26,7 @@ replace_with = "0.1.7" shared-buffer = { workspace = true } slab = { version = "0.4" } thiserror = "1" -tokio = { version = "1", features = ["io-util", "sync", "macros"], default-features = false } +tokio = { workspace = true, features = ["io-util", "sync", "macros"], default-features = false } tracing = { version = "0.1" } typetag = { version = "0.1", optional = true } webc = { workspace = true, optional = true, features = ["v1"] } @@ -42,7 +42,7 @@ getrandom = { version = "0.2", features = [ "js" ] } pretty_assertions = "1.3.0" tempfile = "3.6.0" tracing-test = "0.2.4" -tokio = { version = "1", features = ["io-util", "rt"], default-features = false } +tokio = { workspace = true, features = ["io-util", "rt"], default-features = false } [features] default = ["host-fs", "webc-fs", "static-fs"] diff --git a/lib/virtual-io/Cargo.toml b/lib/virtual-io/Cargo.toml index 4d25ba07536..bb9a02f31e8 100644 --- a/lib/virtual-io/Cargo.toml +++ b/lib/virtual-io/Cargo.toml @@ -14,11 +14,11 @@ thiserror = "1" bytes = "1.1" async-trait = { version = "^0.1" } tracing = "0.1" -mio = { version = "0.8", features = [ "os-poll" ], optional = true } -socket2 = { version = "0.4", optional = true } +mio = { workspace = true, features = [ "os-poll" ], optional = true } +socket2 = { workspace = true, optional = true } derivative = { version = "^2" } futures = { version = "0.3" } serde = { version = "1.0", default-features = false, features = ["derive"] } [features] -sys = [ "mio", "socket2" ] \ No newline at end of file +sys = [ "mio", "socket2" ] diff --git a/lib/virtual-net/Cargo.toml b/lib/virtual-net/Cargo.toml index 2d7c3ce76b3..6f409b97faa 100644 --- a/lib/virtual-net/Cargo.toml +++ b/lib/virtual-net/Cargo.toml @@ -14,10 +14,10 @@ thiserror = "1" bytes = "1.1" async-trait = { version = "^0.1" } tracing = "0.1" -tokio = { version = "1", default-features = false, features = ["io-util"] } +tokio = { workspace = true, default-features = false, features = ["io-util"] } libc = { workspace = true, optional = true } -mio = { version = "0.8", optional = true } -socket2 = { version = "0.4", optional = true } +mio = { workspace = true, optional = true } +socket2 = { workspace = true, optional = true } derivative = { version = "^2" } virtual-mio = { path = "../virtual-io", version = "0.3.0", default-features = false } base64 = "0.21" @@ -41,7 +41,7 @@ default-features = false features = ["proto-ipv4", "std", "alloc"] [dev-dependencies] -tokio = { version = "1", default-features = false, features = [ "macros", "rt-multi-thread" ] } +tokio = { workspace = true, default-features = false, features = [ "macros", "rt-multi-thread" ] } tracing-test = { version = "0.2" } serial_test = "2.0.0" diff --git a/lib/wasix/Cargo.toml b/lib/wasix/Cargo.toml index ff1da6ed517..3d1f41734d7 100644 --- a/lib/wasix/Cargo.toml +++ b/lib/wasix/Cargo.toml @@ -44,7 +44,7 @@ sha2 = { version = "0.10" } waker-fn = { version = "1.1" } cooked-waker = "^5" rand = "0.8" -tokio = { version = "1", features = [ +tokio = { workspace = true, features = [ "sync", "macros", "time", @@ -130,7 +130,7 @@ terminal_size = { version = "0.3.0" } [dev-dependencies] wasmer = { path = "../api", version = "=4.3.5", default-features = false, features = ["wat", "js-serializable-module"] } -tokio = { version = "1", features = [ "sync", "macros", "rt" ], default-features = false } +tokio = { workspace = true, features = [ "sync", "macros", "rt" ], default-features = false } pretty_assertions = "1.3.0" tracing-test = "0.2.4" wasm-bindgen-test = "0.3.0" diff --git a/tests/integration/cli/Cargo.toml b/tests/integration/cli/Cargo.toml index fee7a1f194a..e05bc519ad9 100644 --- a/tests/integration/cli/Cargo.toml +++ b/tests/integration/cli/Cargo.toml @@ -17,7 +17,7 @@ hex = "0.4.3" pretty_assertions = "1.3.0" object = "0.30.0" reqwest = { workspace = true, default-features = false, features = ["json", "blocking", "rustls-tls"] } -tokio = { version = "1", features = [ "rt", "rt-multi-thread", "macros" ] } +tokio = { workspace = true, features = [ "rt", "rt-multi-thread", "macros" ] } assert_cmd = "2.0.8" predicates = "2.1.5" once_cell = "1.17.1" diff --git a/tests/lib/wast/Cargo.toml b/tests/lib/wast/Cargo.toml index a4c9a32b9d8..2d73ca3b3f3 100644 --- a/tests/lib/wast/Cargo.toml +++ b/tests/lib/wast/Cargo.toml @@ -22,7 +22,7 @@ serde = "1" tempfile = "3.6.0" thiserror = "1.0" futures = "0.3" -tokio = { version = "1", features = [ +tokio = { workspace = true, features = [ "io-util", "rt", ], default-features = false } diff --git a/tests/wasmer-argus/Cargo.toml b/tests/wasmer-argus/Cargo.toml index 09a116fa553..5640c4601d2 100644 --- a/tests/wasmer-argus/Cargo.toml +++ b/tests/wasmer-argus/Cargo.toml @@ -19,7 +19,7 @@ cynic = "3.4.3" url = "2.5.0" futures = "0.3.30" tracing = "0.1.40" -tokio = { version = "1.36.0", features = ["rt-multi-thread", "sync", "time", "fs"] } +tokio = { workspace = true, features = ["rt-multi-thread", "sync", "time", "fs"] } clap = {version = "4.4.11", features = ["derive", "string"]} tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } serde = { version = "1.0.197", features = ["derive"] }