From 6825ac9cea2c155349a6ae900552fe8c14da1b0a Mon Sep 17 00:00:00 2001 From: ryan Date: Wed, 10 Jan 2024 21:28:46 -0500 Subject: [PATCH] keyfork-prompt: use vendored keyfork-crossterm --- Cargo.lock | 17 +---------------- keyfork-prompt/Cargo.toml | 2 +- keyfork-prompt/src/alternate_screen.rs | 2 +- keyfork-prompt/src/lib.rs | 2 +- keyfork-prompt/src/raw_mode.rs | 2 +- 5 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3a7113b..f4d0a7c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -670,21 +670,6 @@ version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" -[[package]] -name = "crossterm" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" -dependencies = [ - "bitflags 2.4.1", - "filedescriptor", - "libc", - "mio", - "parking_lot", - "signal-hook", - "signal-hook-mio", -] - [[package]] name = "crossterm_winapi" version = "0.9.1" @@ -1549,7 +1534,7 @@ dependencies = [ name = "keyfork-prompt" version = "0.1.0" dependencies = [ - "crossterm", + "keyfork-crossterm", "keyfork-mnemonic-util", "thiserror", ] diff --git a/keyfork-prompt/Cargo.toml b/keyfork-prompt/Cargo.toml index 578823b..d7a5bf6 100644 --- a/keyfork-prompt/Cargo.toml +++ b/keyfork-prompt/Cargo.toml @@ -11,6 +11,6 @@ mnemonic = ["keyfork-mnemonic-util"] qrencode = [] [dependencies] -crossterm = { version = "0.27.0", default-features = false, features = ["use-dev-tty", "events", "bracketed-paste"] } +keyfork-crossterm = { version = "0.27.1", path = "../keyfork-crossterm", default-features = false, features = ["use-dev-tty", "events", "bracketed-paste"] } keyfork-mnemonic-util = { version = "0.1.0", path = "../keyfork-mnemonic-util", optional = true } thiserror = "1.0.51" diff --git a/keyfork-prompt/src/alternate_screen.rs b/keyfork-prompt/src/alternate_screen.rs index ed22e50..ce857dc 100644 --- a/keyfork-prompt/src/alternate_screen.rs +++ b/keyfork-prompt/src/alternate_screen.rs @@ -3,7 +3,7 @@ use std::{ os::fd::AsRawFd, }; -use crossterm::{ +use keyfork_crossterm::{ cursor::MoveTo, terminal::{EnterAlternateScreen, LeaveAlternateScreen}, ExecutableCommand, diff --git a/keyfork-prompt/src/lib.rs b/keyfork-prompt/src/lib.rs index af60c0a..703bfb3 100644 --- a/keyfork-prompt/src/lib.rs +++ b/keyfork-prompt/src/lib.rs @@ -6,7 +6,7 @@ use std::{ #[cfg(feature = "mnemonic")] use keyfork_mnemonic_util::Wordlist; -use crossterm::{ +use keyfork_crossterm::{ cursor, event::{read, DisableBracketedPaste, EnableBracketedPaste, Event, KeyCode, KeyModifiers}, style::{Print, PrintStyledContent, Stylize}, diff --git a/keyfork-prompt/src/raw_mode.rs b/keyfork-prompt/src/raw_mode.rs index 60be05c..d60eb18 100644 --- a/keyfork-prompt/src/raw_mode.rs +++ b/keyfork-prompt/src/raw_mode.rs @@ -3,7 +3,7 @@ use std::{ os::fd::AsRawFd, }; -use crossterm::terminal; +use keyfork_crossterm::terminal; use crate::Result;