Skip to content

Commit 88d519f

Browse files
committed
Auto merge of #3628 - RalfJung:tokio, r=RalfJung
add back some tokio features Turns out I went a bit too fer when I removed features, so `socketpair` was no longer used.
2 parents 10d4140 + 561bd9a commit 88d519f

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

src/tools/miri/test_dependencies/Cargo.lock

+10
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,15 @@ dependencies = [
253253
"windows-sys 0.52.0",
254254
]
255255

256+
[[package]]
257+
name = "signal-hook-registry"
258+
version = "1.4.2"
259+
source = "registry+https://github.com/rust-lang/crates.io-index"
260+
checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
261+
dependencies = [
262+
"libc",
263+
]
264+
256265
[[package]]
257266
name = "socket2"
258267
version = "0.5.7"
@@ -297,6 +306,7 @@ dependencies = [
297306
"mio",
298307
"num_cpus",
299308
"pin-project-lite",
309+
"signal-hook-registry",
300310
"socket2",
301311
"tokio-macros",
302312
"windows-sys 0.48.0",

src/tools/miri/test_dependencies/Cargo.toml

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ getrandom_02 = { package = "getrandom", version = "0.2", features = ["js"] }
1818
[target.'cfg(not(any(target_arch = "wasm32", target_arch = "wasm64")))'.dependencies]
1919
tempfile = "3"
2020
page_size = "0.6"
21-
tokio = { version = "1.24", features = ["macros", "rt-multi-thread", "time", "net"] }
21+
# Avoid pulling in all of tokio's dependencies.
22+
# However, without `net` and `signal`, tokio uses fewer relevant system APIs.
23+
tokio = { version = "1.24", features = ["macros", "rt-multi-thread", "time", "net", "fs", "sync", "signal"] }
2224

2325
[target.'cfg(windows)'.dependencies]
2426
windows-sys = { version = "0.52", features = [ "Win32_Foundation", "Win32_System_Threading" ] }

0 commit comments

Comments
 (0)