diff options
author | Joel Galenson <jgalenson@google.com> | 2021-10-08 19:34:14 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-08 19:34:14 +0000 |
commit | 7c69dbe097f4ba0a1a0aa9e67ed50294b68fa3dc (patch) | |
tree | 71a18fec0599d209bd7c1b95140dc75566fa3788 /Cargo.toml | |
parent | 5995a2b9e75ea42269618222220e58a0d39de6e3 (diff) | |
parent | e16ac718df3b8af3bef9bc0c1b6c9bfb5f8e71e1 (diff) | |
download | tokio-7c69dbe097f4ba0a1a0aa9e67ed50294b68fa3dc.tar.gz |
Merge "Upgrade rust/crates/tokio to 1.12.0" am: e16ac718df
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1833327
Change-Id: If3efbcadf0ba1879fc7b299ef291c17dd49fcf61
Diffstat (limited to 'Cargo.toml')
-rw-r--r-- | Cargo.toml | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -13,11 +13,11 @@ [package] edition = "2018" name = "tokio" -version = "1.10.1" +version = "1.12.0" authors = ["Tokio Contributors <team@tokio.rs>"] description = "An event-driven, non-blocking I/O platform for writing asynchronous I/O\nbacked applications.\n" homepage = "https://tokio.rs" -documentation = "https://docs.rs/tokio/1.10.0/tokio/" +documentation = "https://docs.rs/tokio/1.12.0/tokio/" readme = "README.md" keywords = ["io", "async", "non-blocking", "futures"] categories = ["asynchronous", "network-programming"] @@ -101,12 +101,16 @@ process = ["bytes", "once_cell", "libc", "mio/os-poll", "mio/os-util", "mio/uds" rt = [] rt-multi-thread = ["num_cpus", "rt"] signal = ["once_cell", "libc", "mio/os-poll", "mio/uds", "mio/os-util", "signal-hook-registry", "winapi/consoleapi"] +stats = [] sync = [] test-util = ["rt", "sync", "time"] time = [] [target."cfg(loom)".dev-dependencies.loom] version = "0.5" features = ["futures", "checkpoint"] +[target."cfg(target_os = \"freebsd\")".dev-dependencies.mio-aio] +version = "0.6.0" +features = ["tokio"] [target."cfg(tokio_unstable)".dependencies.tracing] version = "0.1.21" features = ["std"] |