From 2f970a5daf50796aaab4d93a2a84e0f293809ac0 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Thu, 24 Feb 2022 17:22:47 -0500 Subject: i only need futures-util here --- Cargo.lock | 58 +++--------------------------------------------- Cargo.toml | 2 +- src/bin/ttyplay/timer.rs | 4 ++-- 3 files changed, 6 insertions(+), 58 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 18e6301..cb38916 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -74,54 +74,12 @@ dependencies = [ "vec_map", ] -[[package]] -name = "futures" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" -dependencies = [ - "futures-core", - "futures-sink", -] - [[package]] name = "futures-core" version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" -[[package]] -name = "futures-executor" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" - [[package]] name = "futures-macro" version = "0.3.21" @@ -133,12 +91,6 @@ dependencies = [ "syn", ] -[[package]] -name = "futures-sink" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" - [[package]] name = "futures-task" version = "0.3.21" @@ -151,13 +103,9 @@ version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" dependencies = [ - "futures-channel", "futures-core", - "futures-io", "futures-macro", - "futures-sink", "futures-task", - "memchr", "pin-project-lite", "pin-utils", "slab", @@ -515,7 +463,7 @@ dependencies = [ [[package]] name = "textmode" version = "0.3.0" -source = "git+https://github.com/doy/textmode#3df7202f1daf634a49e88dd2ecd8587bade0baeb" +source = "git+https://github.com/doy/textmode#193e1963afc4e9e78122573cd5b9831f9a847345" dependencies = [ "itoa", "nix", @@ -568,7 +516,7 @@ dependencies = [ [[package]] name = "ttyrec" version = "0.3.3" -source = "git+https://github.com/doy/ttyrec#4f0b0ae8d1e3ff3c3af616e88ee7c51e583743b1" +source = "git+https://github.com/doy/ttyrec#f17be1ae2833167b87ce17f89061efa706b0fa43" dependencies = [ "tokio", ] @@ -578,7 +526,7 @@ name = "ttyrec-bin" version = "0.1.3" dependencies = [ "anyhow", - "futures", + "futures-util", "libc", "paw", "pty-process", diff --git a/Cargo.toml b/Cargo.toml index aa1e9bc..188d892 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ include = ["src/**/*", "LICENSE", "README.md", "CHANGELOG.md"] [dependencies] anyhow = "1.0.55" -futures = "0.3.21" +futures-util = "0.3.21" libc = "0.2.119" paw = "1.0.0" pty-process = { version = "0.2.0", features = ["async"] } diff --git a/src/bin/ttyplay/timer.rs b/src/bin/ttyplay/timer.rs index e8dc0fa..b212b4a 100644 --- a/src/bin/ttyplay/timer.rs +++ b/src/bin/ttyplay/timer.rs @@ -1,4 +1,4 @@ -use futures::future::FutureExt as _; +use futures_util::future::FutureExt as _; pub fn spawn_task( event_w: tokio::sync::mpsc::UnboundedSender, @@ -69,7 +69,7 @@ pub fn spawn_task( None } }; - let select: futures::future::SelectAll<_> = [ + let select: futures_util::future::SelectAll<_> = [ wait.map(Res::Frame).boxed(), timer_r.recv().map(Res::Action).boxed(), ] -- cgit v1.2.3-54-g00ecf