Skip to content

Commit

Permalink
Auto merge of #3628 - RalfJung:tokio, r=RalfJung
Browse files Browse the repository at this point in the history
add back some tokio features

Turns out I went a bit too fer when I removed features, so `socketpair` was no longer used.
  • Loading branch information
bors committed May 24, 2024
2 parents 10d4140 + 561bd9a commit 88d519f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
10 changes: 10 additions & 0 deletions src/tools/miri/test_dependencies/Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,15 @@ dependencies = [
"windows-sys 0.52.0",
]

[[package]]
name = "signal-hook-registry"
version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
dependencies = [
"libc",
]

[[package]]
name = "socket2"
version = "0.5.7"
Expand Down Expand Up @@ -297,6 +306,7 @@ dependencies = [
"mio",
"num_cpus",
"pin-project-lite",
"signal-hook-registry",
"socket2",
"tokio-macros",
"windows-sys 0.48.0",
Expand Down
4 changes: 3 additions & 1 deletion src/tools/miri/test_dependencies/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ getrandom_02 = { package = "getrandom", version = "0.2", features = ["js"] }
[target.'cfg(not(any(target_arch = "wasm32", target_arch = "wasm64")))'.dependencies]
tempfile = "3"
page_size = "0.6"
tokio = { version = "1.24", features = ["macros", "rt-multi-thread", "time", "net"] }
# Avoid pulling in all of tokio's dependencies.
# However, without `net` and `signal`, tokio uses fewer relevant system APIs.
tokio = { version = "1.24", features = ["macros", "rt-multi-thread", "time", "net", "fs", "sync", "signal"] }

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

0 comments on commit 88d519f

Please sign in to comment.