diff options
| author | bors <bors@rust-lang.org> | 2024-05-24 06:37:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-05-24 06:37:35 +0000 |
| commit | 88d519f718bf4c44302aac2127ab97cd3010573d (patch) | |
| tree | 281512fc44e6f5ccfae62a4504830f4247bcbc71 | |
| parent | 10d414091b4b617fea2e258054f3c913b918d82f (diff) | |
| parent | 561bd9a5ecd0cd7c5ff006dbdb59685a07432a27 (diff) | |
| download | rust-88d519f718bf4c44302aac2127ab97cd3010573d.tar.gz rust-88d519f718bf4c44302aac2127ab97cd3010573d.zip | |
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.
| -rw-r--r-- | src/tools/miri/test_dependencies/Cargo.lock | 10 | ||||
| -rw-r--r-- | src/tools/miri/test_dependencies/Cargo.toml | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/tools/miri/test_dependencies/Cargo.lock b/src/tools/miri/test_dependencies/Cargo.lock index c73d13a4620..d534fdab291 100644 --- a/src/tools/miri/test_dependencies/Cargo.lock +++ b/src/tools/miri/test_dependencies/Cargo.lock @@ -254,6 +254,15 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -297,6 +306,7 @@ dependencies = [ "mio", "num_cpus", "pin-project-lite", + "signal-hook-registry", "socket2", "tokio-macros", "windows-sys 0.48.0", diff --git a/src/tools/miri/test_dependencies/Cargo.toml b/src/tools/miri/test_dependencies/Cargo.toml index e40dd50a444..ce11a8abb0e 100644 --- a/src/tools/miri/test_dependencies/Cargo.toml +++ b/src/tools/miri/test_dependencies/Cargo.toml @@ -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" ] } |