diff --git a/Cargo.lock b/Cargo.lock index 09ae846..7ee7499 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -263,7 +263,7 @@ dependencies = [ [[package]] name = "cryptools" -version = "0.12.2" +version = "0.12.3" dependencies = [ "chrono", "crptls", @@ -273,7 +273,7 @@ dependencies = [ "rust_decimal_macros", "rustyline", "structopt", - "termion", + "termion 2.0.1", "tui", ] @@ -662,13 +662,22 @@ version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "redox_termios" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" dependencies = [ - "redox_syscall", + "redox_syscall 0.1.57", ] [[package]] @@ -912,7 +921,19 @@ checksum = "c22cec9d8978d906be5ac94bceb5a010d885c626c4c8855721a4dbd20e3ac905" dependencies = [ "libc", "numtoa", - "redox_syscall", + "redox_syscall 0.1.57", + "redox_termios", +] + +[[package]] +name = "termion" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "659c1f379f3408c7e5e84c7d0da6d93404e3800b6b9d063ba24436419302ec90" +dependencies = [ + "libc", + "numtoa", + "redox_syscall 0.2.16", "redox_termios", ] @@ -978,7 +999,7 @@ dependencies = [ "either", "itertools", "log", - "termion", + "termion 1.5.5", "unicode-segmentation", "unicode-width", ] diff --git a/Cargo.toml b/Cargo.toml index 1e5c95f..6ec673f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cryptools" -version = "0.12.2" +version = "0.12.3" authors = ["scoobybejesus "] edition = "2021" description = "Command-line utility for processing cryptocurrency transactions into 'lots' and 'movements'." @@ -21,13 +21,13 @@ path = "src/main.rs" [dependencies] crptls = { path = "crptls" } csv = "1.3.0" -rust_decimal = "1.32" -rust_decimal_macros = "1.32" +rust_decimal = "1.32.0" +rust_decimal_macros = "1.32.0" chrono = { version = "0.4.31", features = ["serde"] } structopt = "0.2.10" rustyline = "12.0.0" tui = { version = "0.8", optional = true, features = ['termion'] } -termion = { version = "1.5", optional = true } +termion = { version = "2.0.1", optional = true } dotenv = "0.15.0" [profile.release] diff --git a/crptls/Cargo.toml b/crptls/Cargo.toml index fca8d52..f8c4c99 100644 --- a/crptls/Cargo.toml +++ b/crptls/Cargo.toml @@ -5,8 +5,8 @@ authors = ["scoobybejesus "] edition = "2021" [dependencies] -rust_decimal = "1.32" -rust_decimal_macros = "1.32" +rust_decimal = "1.32.0" +rust_decimal_macros = "1.32.0" chrono = { version = "0.4.31", features = ["serde"] } csv = "1.3.0" serde = { version = "1.0.189", features = ["derive"] } diff --git a/src/mytui/print_menu_tui.rs b/src/mytui/print_menu_tui.rs index 7ddc289..3d38c5f 100644 --- a/src/mytui/print_menu_tui.rs +++ b/src/mytui/print_menu_tui.rs @@ -9,7 +9,7 @@ use std::error::Error; use tui::Terminal; use tui::backend::TermionBackend; use termion::raw::IntoRawMode; -use termion::screen::AlternateScreen; +use termion::screen::IntoAlternateScreen; use termion::input::MouseTerminal; use termion::event::Key; @@ -32,7 +32,7 @@ pub (crate) fn print_menu_tui( let stdout = io::stdout().into_raw_mode()?; let stdout = MouseTerminal::from(stdout); - let stdout = AlternateScreen::from(stdout); + let stdout = stdout.into_raw_mode()?.into_alternate_screen()?; let backend = TermionBackend::new(stdout); let mut terminal = Terminal::new(backend)?; terminal.hide_cursor()?;