diff --git a/Cargo.lock b/Cargo.lock index 76d50e1aea6..5799a5285cd 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", ] @@ -2288,7 +2288,7 @@ dependencies = [ "itoa", "pin-project-lite", "smallvec 1.13.2", - "tokio 1.38.1", + "tokio 1.39.2", "want", ] @@ -2304,7 +2304,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", @@ -2321,7 +2321,7 @@ dependencies = [ "hyper", "hyper-util", "native-tls", - "tokio 1.38.1", + "tokio 1.39.2", "tokio-native-tls", "tower-service", ] @@ -2336,7 +2336,7 @@ dependencies = [ "hyper", "hyper-util", "pin-project-lite", - "tokio 1.38.1", + "tokio 1.39.2", "tokio-tungstenite", "tungstenite", ] @@ -2354,8 +2354,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", @@ -3055,14 +3055,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]] @@ -3797,7 +3798,7 @@ dependencies = [ "rustc-hash", "rustls 0.23.11", "thiserror", - "tokio 1.38.1", + "tokio 1.39.2", "tracing", ] @@ -3826,7 +3827,7 @@ checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" dependencies = [ "libc", "once_cell", - "socket2 0.5.7", + "socket2", "windows-sys 0.52.0", ] @@ -4069,7 +4070,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", @@ -4819,16 +4820,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" @@ -5206,20 +5197,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]] @@ -5296,9 +5286,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", @@ -5312,7 +5302,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]] @@ -5342,7 +5332,7 @@ checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ "rustls 0.22.4", "rustls-pki-types", - "tokio 1.38.1", + "tokio 1.39.2", ] [[package]] @@ -5353,7 +5343,7 @@ checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ "rustls 0.23.11", "rustls-pki-types", - "tokio 1.38.1", + "tokio 1.39.2", ] [[package]] @@ -5383,7 +5373,7 @@ dependencies = [ "either", "futures-util", "thiserror", - "tokio 1.38.1", + "tokio 1.39.2", ] [[package]] @@ -5394,7 +5384,7 @@ checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", - "tokio 1.38.1", + "tokio 1.39.2", "tokio-util", ] @@ -5462,7 +5452,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", @@ -5511,7 +5501,7 @@ dependencies = [ "futures-core", "futures-sink", "pin-project-lite", - "tokio 1.38.1", + "tokio 1.39.2", ] [[package]] @@ -5579,7 +5569,7 @@ dependencies = [ "futures-util", "pin-project", "pin-project-lite", - "tokio 1.38.1", + "tokio 1.39.2", "tower-layer", "tower-service", "tracing", @@ -5997,7 +5987,7 @@ dependencies = [ "slab", "tempfile", "thiserror", - "tokio 1.38.1", + "tokio 1.39.2", "tracing", "tracing-test", "typetag", @@ -6012,9 +6002,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", ] @@ -6035,15 +6025,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", @@ -6448,7 +6438,7 @@ dependencies = [ "serde_json", "serde_path_to_error", "time 0.3.36", - "tokio 1.38.1", + "tokio 1.39.2", "tracing", "url", "uuid", @@ -6472,7 +6462,7 @@ dependencies = [ "serde", "serde_json", "shared-buffer", - "tokio 1.38.1", + "tokio 1.39.2", "tracing", "tracing-subscriber", "url", @@ -6510,7 +6500,7 @@ dependencies = [ "libc", "paste", "thiserror", - "tokio 1.38.1", + "tokio 1.39.2", "tracing", "tracing-subscriber", "typetag", @@ -6606,7 +6596,7 @@ dependencies = [ "libc", "log 0.4.22", "mac_address", - "mio 0.8.11", + "mio 1.0.1", "normpath", "object 0.32.2", "once_cell", @@ -6631,7 +6621,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", @@ -6677,7 +6667,7 @@ dependencies = [ "lazy_static", "leb128", "libc", - "memmap2 0.5.10", + "memmap2 0.6.2", "more-asserts", "region", "rkyv", @@ -6899,7 +6889,7 @@ dependencies = [ "tar", "target-lexicon 0.12.15", "tempfile", - "tokio 1.38.1", + "tokio 1.39.2", "wasmer-registry", ] @@ -7000,7 +6990,7 @@ dependencies = [ "thiserror", "time 0.3.36", "tldextract", - "tokio 1.38.1", + "tokio 1.39.2", "tokio-tungstenite", "toml 0.5.11", "tracing", @@ -7127,7 +7117,7 @@ dependencies = [ "terminal_size", "termios", "thiserror", - "tokio 1.38.1", + "tokio 1.39.2", "tokio-stream", "toml 0.8.15", "tower", @@ -7205,7 +7195,7 @@ dependencies = [ "serde", "tempfile", "thiserror", - "tokio 1.38.1", + "tokio 1.39.2", "virtual-fs", "wasmer", "wasmer-types", @@ -7234,7 +7224,7 @@ dependencies = [ "tempfile", "test-generator", "test-log", - "tokio 1.38.1", + "tokio 1.39.2", "tracing", "tracing-subscriber", "ureq", @@ -7357,7 +7347,7 @@ dependencies = [ "http 0.2.12", "schemars", "serde", - "tokio 1.38.1", + "tokio 1.39.2", "wasmparser 0.95.0", "wcgi 0.1.2", ] @@ -7370,7 +7360,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 bc5fda534eb..3139a4ada41 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ wasmer-middlewares = { version = "=4.3.7", 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", @@ -76,6 +76,9 @@ members = [ "tests/wasi-wast", "tests/wasmer-argus", ] +exclude = [ + "./lib/cli/tests/packages/axum" +] resolver = "2" [workspace.package] @@ -110,6 +113,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" pretty_assertions = "1.4.0" base64 = "0.22.0" diff --git a/lib/backend-api/Cargo.toml b/lib/backend-api/Cargo.toml index e67d45522a3..70a4ff30125 100644 --- a/lib/backend-api/Cargo.toml +++ b/lib/backend-api/Cargo.toml @@ -25,7 +25,7 @@ reqwest = { workspace = true, default-features = false, features = ["json"] } 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 = { version = "2", features = ["serde"] } futures = "0.3" @@ -41,6 +41,6 @@ version = "0.2.14" features = ["js"] [dev-dependencies] +tokio = { workspace = true, features = ["macros", "rt"] } base64.workspace = true -tokio = { version = "1.3", features = ["macros", "rt"] } uuid = { version = "1", features = ["v4"] } diff --git a/lib/c-api/Cargo.toml b/lib/c-api/Cargo.toml index f57ff794ddf..111837fe644 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 00984ad746c..4e75d442cc8 100644 --- a/lib/cli/Cargo.toml +++ b/lib/cli/Cargo.toml @@ -201,7 +201,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" @@ -221,7 +221,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 abed0d31320..29cee1f45c3 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 d6d90d05b9d..418fa8062e7 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 b740223f236..47afa4a371a 100644 --- a/lib/virtual-fs/Cargo.toml +++ b/lib/virtual-fs/Cargo.toml @@ -27,7 +27,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"] } @@ -43,7 +43,7 @@ getrandom = { version = "0.2", features = [ "js" ] } pretty_assertions.workspace = true 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 d2a41b770fb..265866870c7 100644 --- a/lib/virtual-net/Cargo.toml +++ b/lib/virtual-net/Cargo.toml @@ -11,7 +11,6 @@ rust-version.workspace = true [dependencies] base64.workspace = true -libc = { workspace = true, optional = true } hyper = { workspace = true, optional = true } rkyv = { workspace = true, optional = true } @@ -19,9 +18,10 @@ thiserror = "1" bytes = "1.1" async-trait = { version = "^0.1" } tracing = "0.1" -tokio = { version = "1", default-features = false, features = ["io-util"] } -mio = { version = "0.8", optional = true, features = ["net"] } -socket2 = { version = "0.4", optional = true } +tokio = { workspace = true, default-features = false, features = ["io-util"] } +libc = { workspace = true, 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 } bincode = { version = "1.3" } @@ -42,7 +42,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/virtual-net/src/host.rs b/lib/virtual-net/src/host.rs index 0d14a1e2675..3fd1000d7bc 100644 --- a/lib/virtual-net/src/host.rs +++ b/lib/virtual-net/src/host.rs @@ -16,6 +16,9 @@ use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, Shutdown, SocketAddr}; use std::os::fd::AsRawFd; #[cfg(not(target_os = "windows"))] use std::os::fd::RawFd; +#[cfg(windows)] +use std::os::windows::io::AsRawSocket; + use std::sync::Arc; use std::task::Poll; use std::time::Duration; @@ -87,7 +90,6 @@ impl VirtualNetworking for LocalNetworking { _reuse_addr: bool, ) -> Result> { let socket = mio::net::UdpSocket::bind(addr).map_err(io_err_into_net_error)?; - socket2::SockRef::from(&socket).set_nonblocking(true).ok(); #[allow(unused_mut)] let mut ret = LocalUdpSocket { @@ -118,7 +120,7 @@ impl VirtualNetworking for LocalNetworking { mut peer: SocketAddr, ) -> Result> { let stream = mio::net::TcpStream::connect(peer).map_err(io_err_into_net_error)?; - socket2::SockRef::from(&stream).set_nonblocking(true).ok(); + if let Ok(p) = stream.peer_addr() { peer = p; } @@ -161,9 +163,6 @@ impl LocalTcpListener { fn try_accept_internal(&mut self) -> Result<(Box, SocketAddr)> { match self.stream.accept().map_err(io_err_into_net_error) { Ok((stream, addr)) => { - socket2::SockRef::from(&self.stream) - .set_nonblocking(true) - .ok(); let mut socket = LocalTcpStream::new(self.selector.clone(), stream, addr); if let Some(no_delay) = self.no_delay { socket.set_nodelay(no_delay).ok(); @@ -333,6 +332,23 @@ impl LocalTcpStream { ret } + + fn with_sock_ref(&self, f: F) -> R + where + for<'a> F: FnOnce(socket2::SockRef<'a>) -> R, + { + #[cfg(not(windows))] + let r = socket2::SockRef::from(&self.stream); + + #[cfg(windows)] + let b = unsafe { + std::os::windows::io::BorrowedSocket::borrow_raw(self.stream.as_raw_socket()) + }; + #[cfg(windows)] + let r = socket2::SockRef::from(&b); + + f(r) + } } impl VirtualTcpSocket for LocalTcpStream { @@ -363,15 +379,14 @@ impl VirtualTcpSocket for LocalTcpStream { } fn set_keepalive(&mut self, keepalive: bool) -> Result<()> { - socket2::SockRef::from(&self.stream) - .set_keepalive(true) + self.with_sock_ref(|s| s.set_keepalive(true)) .map_err(io_err_into_net_error)?; Ok(()) } fn keepalive(&self) -> Result { - let ret = socket2::SockRef::from(&self.stream) - .keepalive() + let ret = self + .with_sock_ref(|s| s.keepalive()) .map_err(io_err_into_net_error)?; Ok(ret) } @@ -444,15 +459,13 @@ impl VirtualTcpSocket for LocalTcpStream { impl VirtualConnectedSocket for LocalTcpStream { fn set_linger(&mut self, linger: Option) -> Result<()> { - socket2::SockRef::from(&self.stream) - .set_linger(linger) + self.with_sock_ref(|s| s.set_linger(linger)) .map_err(io_err_into_net_error)?; Ok(()) } fn linger(&self) -> Result> { - socket2::SockRef::from(&self.stream) - .linger() + self.with_sock_ref(|s| s.linger()) .map_err(io_err_into_net_error) } @@ -654,6 +667,25 @@ pub struct LocalUdpSocket { backlog: VecDeque<(BytesMut, SocketAddr)>, } +impl LocalUdpSocket { + fn with_sock_ref(&self, f: F) -> R + where + for<'a> F: FnOnce(socket2::SockRef<'a>) -> R, + { + #[cfg(not(windows))] + let r = socket2::SockRef::from(&self.socket); + + #[cfg(windows)] + let b = unsafe { + std::os::windows::io::BorrowedSocket::borrow_raw(self.socket.as_raw_socket()) + }; + #[cfg(windows)] + let r = socket2::SockRef::from(&b); + + f(r) + } +} + impl VirtualUdpSocket for LocalUdpSocket { fn set_broadcast(&mut self, broadcast: bool) -> Result<()> { self.socket @@ -702,14 +734,12 @@ impl VirtualUdpSocket for LocalUdpSocket { } fn join_multicast_v4(&mut self, multiaddr: Ipv4Addr, iface: Ipv4Addr) -> Result<()> { - socket2::SockRef::from(&self.socket) - .join_multicast_v4(&multiaddr, &iface) + self.with_sock_ref(|s| s.join_multicast_v4(&multiaddr, &iface)) .map_err(io_err_into_net_error) } fn leave_multicast_v4(&mut self, multiaddr: Ipv4Addr, iface: Ipv4Addr) -> Result<()> { - socket2::SockRef::from(&self.socket) - .leave_multicast_v4(&multiaddr, &iface) + self.with_sock_ref(|s| s.leave_multicast_v4(&multiaddr, &iface)) .map_err(io_err_into_net_error) } diff --git a/lib/wasix/Cargo.toml b/lib/wasix/Cargo.toml index 8093d25abdd..294b9d631a9 100644 --- a/lib/wasix/Cargo.toml +++ b/lib/wasix/Cargo.toml @@ -50,7 +50,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", @@ -132,7 +132,7 @@ terminal_size = { version = "0.3.0" } [dev-dependencies] wasmer = { path = "../api", version = "=4.3.7", 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.workspace = true 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 4b051c920ee..76fa9dcf3f3 100644 --- a/tests/integration/cli/Cargo.toml +++ b/tests/integration/cli/Cargo.toml @@ -17,7 +17,7 @@ hex = "0.4.3" pretty_assertions.workspace = true 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 fa5c1a4935f..848f1329a17 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 39bddde419b..201d1ec6ec9 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"] }