From 3f62ce9c199bb0048996bbdeb236d6e5522ec9e0 Mon Sep 17 00:00:00 2001 From: Florian Dehau Date: Fri, 13 Mar 2020 02:02:51 +0100 Subject: [PATCH] chore: remove unecessary dependencies * Remove log, stderrlog, structopt * Add argh --- Cargo.toml | 5 +---- examples/barchart.rs | 23 ++++++++++------------- examples/block.rs | 22 ++++++++++------------ examples/canvas.rs | 28 +++++++++++++--------------- examples/chart.rs | 4 ++-- examples/crossterm_demo.rs | 16 ++++++++-------- examples/curses_demo.rs | 29 ++++++++++++++--------------- examples/custom_widget.rs | 20 ++++++-------------- examples/gauge.rs | 23 ++++++++++------------- examples/layout.rs | 21 +++++++++------------ examples/list.rs | 23 ++++++++++------------- examples/paragraph.rs | 23 ++++++++++------------- examples/rustbox_demo.rs | 27 +++++++++++++-------------- examples/sparkline.rs | 29 ++++++++++++++--------------- examples/table.rs | 4 ++-- examples/tabs.rs | 29 ++++++++++++++--------------- examples/termion_demo.rs | 28 ++++++++++------------------ examples/user_input.rs | 31 ++++++++++++++++--------------- src/backend/rustbox.rs | 15 ++++++--------- src/backend/termion.rs | 2 -- src/terminal.rs | 3 +-- 21 files changed, 179 insertions(+), 226 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d6097831..09ba00e7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,6 @@ curses = ["easycurses", "pancurses"] bitflags = "1.0" cassowary = "0.3" itertools = "0.8" -log = "0.4" either = "1.5" unicode-segmentation = "1.2" unicode-width = "0.1" @@ -33,10 +32,8 @@ easycurses = { version = "0.12.2", optional = true } pancurses = { version = "0.16.1", optional = true, features = ["win32a"] } [dev-dependencies] -stderrlog = "0.4" rand = "0.7" -failure = "0.1" -structopt = "0.3" +argh = "0.1" [[example]] name = "canvas" diff --git a/examples/barchart.rs b/examples/barchart.rs index 23a5bfbe..829e5d72 100644 --- a/examples/barchart.rs +++ b/examples/barchart.rs @@ -1,19 +1,16 @@ #[allow(dead_code)] mod util; -use std::io; - -use termion::event::Key; -use termion::input::MouseTerminal; -use termion::raw::IntoRawMode; -use termion::screen::AlternateScreen; -use tui::backend::TermionBackend; -use tui::layout::{Constraint, Direction, Layout}; -use tui::style::{Color, Modifier, Style}; -use tui::widgets::{BarChart, Block, Borders}; -use tui::Terminal; - use crate::util::event::{Event, Events}; +use std::{error::Error, io}; +use termion::{event::Key, input::MouseTerminal, raw::IntoRawMode, screen::AlternateScreen}; +use tui::{ + backend::TermionBackend, + layout::{Constraint, Direction, Layout}, + style::{Color, Modifier, Style}, + widgets::{BarChart, Block, Borders}, + Terminal, +}; struct App<'a> { data: Vec<(&'a str, u64)>, @@ -57,7 +54,7 @@ impl<'a> App<'a> { } } -fn main() -> Result<(), failure::Error> { +fn main() -> Result<(), Box> { // Terminal initialization let stdout = io::stdout().into_raw_mode()?; let stdout = MouseTerminal::from(stdout); diff --git a/examples/block.rs b/examples/block.rs index e5090a6c..22b852e1 100644 --- a/examples/block.rs +++ b/examples/block.rs @@ -1,20 +1,18 @@ #[allow(dead_code)] mod util; -use std::io; -use termion::event::Key; -use termion::input::MouseTerminal; -use termion::raw::IntoRawMode; -use termion::screen::AlternateScreen; -use tui::backend::TermionBackend; -use tui::layout::{Constraint, Direction, Layout}; -use tui::style::{Color, Modifier, Style}; -use tui::widgets::{Block, BorderType, Borders}; -use tui::Terminal; - use crate::util::event::{Event, Events}; +use std::{error::Error, io}; +use termion::{event::Key, input::MouseTerminal, raw::IntoRawMode, screen::AlternateScreen}; +use tui::{ + backend::TermionBackend, + layout::{Constraint, Direction, Layout}, + style::{Color, Modifier, Style}, + widgets::{Block, BorderType, Borders}, + Terminal, +}; -fn main() -> Result<(), failure::Error> { +fn main() -> Result<(), Box> { // Terminal initialization let stdout = io::stdout().into_raw_mode()?; let stdout = MouseTerminal::from(stdout); diff --git a/examples/canvas.rs b/examples/canvas.rs index b1c5a894..a8d3f033 100644 --- a/examples/canvas.rs +++ b/examples/canvas.rs @@ -1,21 +1,19 @@ #[allow(dead_code)] mod util; -use std::io; -use std::time::Duration; - -use termion::event::Key; -use termion::input::MouseTerminal; -use termion::raw::IntoRawMode; -use termion::screen::AlternateScreen; -use tui::backend::TermionBackend; -use tui::layout::{Constraint, Direction, Layout, Rect}; -use tui::style::Color; -use tui::widgets::canvas::{Canvas, Map, MapResolution, Rectangle}; -use tui::widgets::{Block, Borders}; -use tui::Terminal; - use crate::util::event::{Config, Event, Events}; +use std::{error::Error, io, time::Duration}; +use termion::{event::Key, input::MouseTerminal, raw::IntoRawMode, screen::AlternateScreen}; +use tui::{ + backend::TermionBackend, + layout::{Constraint, Direction, Layout, Rect}, + style::Color, + widgets::{ + canvas::{Canvas, Map, MapResolution, Rectangle}, + Block, Borders, + }, + Terminal, +}; struct App { x: f64, @@ -74,7 +72,7 @@ impl App { } } -fn main() -> Result<(), failure::Error> { +fn main() -> Result<(), Box> { // Terminal initialization let stdout = io::stdout().into_raw_mode()?; let stdout = MouseTerminal::from(stdout); diff --git a/examples/chart.rs b/examples/chart.rs index 086c275d..87fe1753 100644 --- a/examples/chart.rs +++ b/examples/chart.rs @@ -5,7 +5,7 @@ use crate::util::{ event::{Event, Events}, SinSignal, }; -use std::io; +use std::{error::Error, io}; use termion::{event::Key, input::MouseTerminal, raw::IntoRawMode, screen::AlternateScreen}; use tui::{ backend::TermionBackend, @@ -63,7 +63,7 @@ impl App { } } -fn main() -> Result<(), failure::Error> { +fn main() -> Result<(), Box> { // Terminal initialization let stdout = io::stdout().into_raw_mode()?; let stdout = MouseTerminal::from(stdout); diff --git a/examples/crossterm_demo.rs b/examples/crossterm_demo.rs index f3ac3824..3ea21f4c 100644 --- a/examples/crossterm_demo.rs +++ b/examples/crossterm_demo.rs @@ -4,18 +4,19 @@ mod demo; mod util; use crate::demo::{ui, App}; +use argh::FromArgs; use crossterm::{ event::{self, Event as CEvent, KeyCode}, execute, terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen}, }; use std::{ + error::Error, io::{stdout, Write}, sync::mpsc, thread, time::Duration, }; -use structopt::StructOpt; use tui::{backend::CrosstermBackend, Terminal}; enum Event { @@ -23,17 +24,16 @@ enum Event { Tick, } -#[derive(Debug, StructOpt)] +/// Crossterm demo +#[derive(Debug, FromArgs)] struct Cli { - #[structopt(long = "tick-rate", default_value = "250")] + /// time in ms between two ticks. + #[argh(option, default = "250")] tick_rate: u64, - #[structopt(long = "log")] - log: bool, } -fn main() -> Result<(), failure::Error> { - let cli = Cli::from_args(); - stderrlog::new().quiet(!cli.log).verbosity(4).init()?; +fn main() -> Result<(), Box> { + let cli: Cli = argh::from_env(); enable_raw_mode()?; diff --git a/examples/curses_demo.rs b/examples/curses_demo.rs index e0cb83b6..68753727 100644 --- a/examples/curses_demo.rs +++ b/examples/curses_demo.rs @@ -2,27 +2,26 @@ mod demo; #[allow(dead_code)] mod util; -use std::io; -use std::time::{Duration, Instant}; - -use easycurses; -use structopt::StructOpt; -use tui::backend::CursesBackend; -use tui::Terminal; - use crate::demo::{ui, App}; +use argh::FromArgs; +use easycurses; +use std::{ + error::Error, + io, + time::{Duration, Instant}, +}; +use tui::{backend::CursesBackend, Terminal}; -#[derive(Debug, StructOpt)] +/// Curses demo +#[derive(Debug, FromArgs)] struct Cli { - #[structopt(long = "tick-rate", default_value = "250")] + /// time in ms between two ticks. + #[argh(option, default = "250")] tick_rate: u64, - #[structopt(long = "log")] - log: bool, } -fn main() -> Result<(), failure::Error> { - let cli = Cli::from_args(); - stderrlog::new().quiet(!cli.log).verbosity(4).init()?; +fn main() -> Result<(), Box> { + let cli: Cli = argh::from_env(); let mut backend = CursesBackend::new().ok_or(io::Error::new(io::ErrorKind::Other, ""))?; let curses = backend.get_curses_mut(); diff --git a/examples/custom_widget.rs b/examples/custom_widget.rs index f4c47440..909f0df0 100644 --- a/examples/custom_widget.rs +++ b/examples/custom_widget.rs @@ -1,20 +1,12 @@ #[allow(dead_code)] mod util; -use std::io; - -use termion::event::Key; -use termion::input::MouseTerminal; -use termion::raw::IntoRawMode; -use termion::screen::AlternateScreen; -use tui::backend::TermionBackend; -use tui::buffer::Buffer; -use tui::layout::Rect; -use tui::style::Style; -use tui::widgets::Widget; -use tui::Terminal; - use crate::util::event::{Event, Events}; +use std::{error::Error, io}; +use termion::{event::Key, input::MouseTerminal, raw::IntoRawMode, screen::AlternateScreen}; +use tui::{ + backend::TermionBackend, buffer::Buffer, layout::Rect, style::Style, widgets::Widget, Terminal, +}; struct Label<'a> { text: &'a str, @@ -39,7 +31,7 @@ impl<'a> Label<'a> { } } -fn main() -> Result<(), failure::Error> { +fn main() -> Result<(), Box> { // Terminal initialization let stdout = io::stdout().into_raw_mode()?; let stdout = MouseTerminal::from(stdout); diff --git a/examples/gauge.rs b/examples/gauge.rs index 8327def7..5d410361 100644 --- a/examples/gauge.rs +++ b/examples/gauge.rs @@ -1,19 +1,16 @@ #[allow(dead_code)] mod util; -use std::io; - -use termion::event::Key; -use termion::input::MouseTerminal; -use termion::raw::IntoRawMode; -use termion::screen::AlternateScreen; -use tui::backend::TermionBackend; -use tui::layout::{Constraint, Direction, Layout}; -use tui::style::{Color, Modifier, Style}; -use tui::widgets::{Block, Borders, Gauge}; -use tui::Terminal; - use crate::util::event::{Event, Events}; +use std::{error::Error, io}; +use termion::{event::Key, input::MouseTerminal, raw::IntoRawMode, screen::AlternateScreen}; +use tui::{ + backend::TermionBackend, + layout::{Constraint, Direction, Layout}, + style::{Color, Modifier, Style}, + widgets::{Block, Borders, Gauge}, + Terminal, +}; struct App { progress1: u16, @@ -52,7 +49,7 @@ impl App { } } -fn main() -> Result<(), failure::Error> { +fn main() -> Result<(), Box> { // Terminal initialization let stdout = io::stdout().into_raw_mode()?; let stdout = MouseTerminal::from(stdout); diff --git a/examples/layout.rs b/examples/layout.rs index bb3e1adb..b98d7609 100644 --- a/examples/layout.rs +++ b/examples/layout.rs @@ -1,20 +1,17 @@ #[allow(dead_code)] mod util; -use std::io; - -use termion::event::Key; -use termion::input::MouseTerminal; -use termion::raw::IntoRawMode; -use termion::screen::AlternateScreen; -use tui::backend::TermionBackend; -use tui::layout::{Constraint, Direction, Layout}; -use tui::widgets::{Block, Borders}; -use tui::Terminal; - use crate::util::event::{Event, Events}; +use std::{error::Error, io}; +use termion::{event::Key, input::MouseTerminal, raw::IntoRawMode, screen::AlternateScreen}; +use tui::{ + backend::TermionBackend, + layout::{Constraint, Direction, Layout}, + widgets::{Block, Borders}, + Terminal, +}; -fn main() -> Result<(), failure::Error> { +fn main() -> Result<(), Box> { // Terminal initialization let stdout = io::stdout().into_raw_mode()?; let stdout = MouseTerminal::from(stdout); diff --git a/examples/list.rs b/examples/list.rs index 5729b8af..7397f9f8 100644 --- a/examples/list.rs +++ b/examples/list.rs @@ -1,22 +1,19 @@ #[allow(dead_code)] mod util; -use std::io; - -use termion::event::Key; -use termion::input::MouseTerminal; -use termion::raw::IntoRawMode; -use termion::screen::AlternateScreen; -use tui::backend::TermionBackend; -use tui::layout::{Constraint, Corner, Direction, Layout}; -use tui::style::{Color, Modifier, Style}; -use tui::widgets::{Block, Borders, List, Text}; -use tui::Terminal; - use crate::util::{ event::{Event, Events}, StatefulList, }; +use std::{error::Error, io}; +use termion::{event::Key, input::MouseTerminal, raw::IntoRawMode, screen::AlternateScreen}; +use tui::{ + backend::TermionBackend, + layout::{Constraint, Corner, Direction, Layout}, + style::{Color, Modifier, Style}, + widgets::{Block, Borders, List, Text}, + Terminal, +}; struct App<'a> { items: StatefulList<&'a str>, @@ -76,7 +73,7 @@ impl<'a> App<'a> { } } -fn main() -> Result<(), failure::Error> { +fn main() -> Result<(), Box> { // Terminal initialization let stdout = io::stdout().into_raw_mode()?; let stdout = MouseTerminal::from(stdout); diff --git a/examples/paragraph.rs b/examples/paragraph.rs index 515d0497..c0fe5b32 100644 --- a/examples/paragraph.rs +++ b/examples/paragraph.rs @@ -1,21 +1,18 @@ #[allow(dead_code)] mod util; -use std::io; - -use termion::event::Key; -use termion::input::MouseTerminal; -use termion::raw::IntoRawMode; -use termion::screen::AlternateScreen; -use tui::backend::TermionBackend; -use tui::layout::{Alignment, Constraint, Direction, Layout}; -use tui::style::{Color, Modifier, Style}; -use tui::widgets::{Block, Borders, Paragraph, Text}; -use tui::Terminal; - use crate::util::event::{Event, Events}; +use std::{error::Error, io}; +use termion::{event::Key, input::MouseTerminal, raw::IntoRawMode, screen::AlternateScreen}; +use tui::{ + backend::TermionBackend, + layout::{Alignment, Constraint, Direction, Layout}, + style::{Color, Modifier, Style}, + widgets::{Block, Borders, Paragraph, Text}, + Terminal, +}; -fn main() -> Result<(), failure::Error> { +fn main() -> Result<(), Box> { // Terminal initialization let stdout = io::stdout().into_raw_mode()?; let stdout = MouseTerminal::from(stdout); diff --git a/examples/rustbox_demo.rs b/examples/rustbox_demo.rs index 23712092..7182d353 100644 --- a/examples/rustbox_demo.rs +++ b/examples/rustbox_demo.rs @@ -2,26 +2,25 @@ mod demo; #[allow(dead_code)] mod util; -use std::time::{Duration, Instant}; - -use rustbox::keyboard::Key; -use structopt::StructOpt; -use tui::backend::RustboxBackend; -use tui::Terminal; - use crate::demo::{ui, App}; +use argh::FromArgs; +use rustbox::keyboard::Key; +use std::{ + error::Error, + time::{Duration, Instant}, +}; +use tui::{backend::RustboxBackend, Terminal}; -#[derive(Debug, StructOpt)] +/// Rustbox demo +#[derive(Debug, FromArgs)] struct Cli { - #[structopt(long = "tick-rate", default_value = "250")] + /// time in ms between two ticks. + #[argh(option, default = "250")] tick_rate: u64, - #[structopt(long = "log")] - log: bool, } -fn main() -> Result<(), failure::Error> { - let cli = Cli::from_args(); - stderrlog::new().quiet(!cli.log).verbosity(4).init()?; +fn main() -> Result<(), Box> { + let cli: Cli = argh::from_env(); let backend = RustboxBackend::new()?; let mut terminal = Terminal::new(backend)?; diff --git a/examples/sparkline.rs b/examples/sparkline.rs index 9e3ef413..1b6a056a 100644 --- a/examples/sparkline.rs +++ b/examples/sparkline.rs @@ -1,20 +1,19 @@ #[allow(dead_code)] mod util; -use std::io; - -use termion::event::Key; -use termion::input::MouseTerminal; -use termion::raw::IntoRawMode; -use termion::screen::AlternateScreen; -use tui::backend::TermionBackend; -use tui::layout::{Constraint, Direction, Layout}; -use tui::style::{Color, Style}; -use tui::widgets::{Block, Borders, Sparkline}; -use tui::Terminal; - -use crate::util::event::{Event, Events}; -use crate::util::RandomSignal; +use crate::util::{ + event::{Event, Events}, + RandomSignal, +}; +use std::{error::Error, io}; +use termion::{event::Key, input::MouseTerminal, raw::IntoRawMode, screen::AlternateScreen}; +use tui::{ + backend::TermionBackend, + layout::{Constraint, Direction, Layout}, + style::{Color, Style}, + widgets::{Block, Borders, Sparkline}, + Terminal, +}; struct App { signal: RandomSignal, @@ -50,7 +49,7 @@ impl App { } } -fn main() -> Result<(), failure::Error> { +fn main() -> Result<(), Box> { // Terminal initialization let stdout = io::stdout().into_raw_mode()?; let stdout = MouseTerminal::from(stdout); diff --git a/examples/table.rs b/examples/table.rs index 7abda475..13dbf179 100644 --- a/examples/table.rs +++ b/examples/table.rs @@ -2,7 +2,7 @@ mod util; use crate::util::event::{Event, Events}; -use std::io; +use std::{error::Error, io}; use termion::{event::Key, input::MouseTerminal, raw::IntoRawMode, screen::AlternateScreen}; use tui::{ backend::TermionBackend, @@ -73,7 +73,7 @@ impl<'a> StatefulTable<'a> { } } -fn main() -> Result<(), failure::Error> { +fn main() -> Result<(), Box> { // Terminal initialization let stdout = io::stdout().into_raw_mode()?; let stdout = MouseTerminal::from(stdout); diff --git a/examples/tabs.rs b/examples/tabs.rs index 9d4e846b..4a1a02f7 100644 --- a/examples/tabs.rs +++ b/examples/tabs.rs @@ -1,26 +1,25 @@ #[allow(dead_code)] mod util; -use std::io; - -use termion::event::Key; -use termion::input::MouseTerminal; -use termion::raw::IntoRawMode; -use termion::screen::AlternateScreen; -use tui::backend::TermionBackend; -use tui::layout::{Constraint, Direction, Layout}; -use tui::style::{Color, Style}; -use tui::widgets::{Block, Borders, Tabs}; -use tui::Terminal; - -use crate::util::event::{Event, Events}; -use crate::util::TabsState; +use crate::util::{ + event::{Event, Events}, + TabsState, +}; +use std::{error::Error, io}; +use termion::{event::Key, input::MouseTerminal, raw::IntoRawMode, screen::AlternateScreen}; +use tui::{ + backend::TermionBackend, + layout::{Constraint, Direction, Layout}, + style::{Color, Style}, + widgets::{Block, Borders, Tabs}, + Terminal, +}; struct App<'a> { tabs: TabsState<'a>, } -fn main() -> Result<(), failure::Error> { +fn main() -> Result<(), Box> { // Terminal initialization let stdout = io::stdout().into_raw_mode()?; let stdout = MouseTerminal::from(stdout); diff --git a/examples/termion_demo.rs b/examples/termion_demo.rs index cf37dece..af9bbf15 100644 --- a/examples/termion_demo.rs +++ b/examples/termion_demo.rs @@ -2,33 +2,25 @@ mod demo; #[allow(dead_code)] mod util; -use std::io; -use std::time::Duration; - -use structopt::StructOpt; -use termion::event::Key; -use termion::input::MouseTerminal; -use termion::raw::IntoRawMode; -use termion::screen::AlternateScreen; -use tui::backend::TermionBackend; -use tui::Terminal; - use crate::{ demo::{ui, App}, util::event::{Config, Event, Events}, }; +use argh::FromArgs; +use std::{error::Error, io, time::Duration}; +use termion::{event::Key, input::MouseTerminal, raw::IntoRawMode, screen::AlternateScreen}; +use tui::{backend::TermionBackend, Terminal}; -#[derive(Debug, StructOpt)] +/// Termion demo +#[derive(Debug, FromArgs)] struct Cli { - #[structopt(long = "tick-rate", default_value = "250")] + /// time in ms between two ticks. + #[argh(option, default = "250")] tick_rate: u64, - #[structopt(long = "log")] - log: bool, } -fn main() -> Result<(), failure::Error> { - let cli = Cli::from_args(); - stderrlog::new().quiet(!cli.log).verbosity(4).init()?; +fn main() -> Result<(), Box> { + let cli: Cli = argh::from_env(); let events = Events::with_config(Config { tick_rate: Duration::from_millis(cli.tick_rate), diff --git a/examples/user_input.rs b/examples/user_input.rs index 5e240481..a6390628 100644 --- a/examples/user_input.rs +++ b/examples/user_input.rs @@ -13,21 +13,22 @@ #[allow(dead_code)] mod util; -use std::io::{self, Write}; - -use termion::cursor::Goto; -use termion::event::Key; -use termion::input::MouseTerminal; -use termion::raw::IntoRawMode; -use termion::screen::AlternateScreen; -use tui::backend::TermionBackend; -use tui::layout::{Constraint, Direction, Layout}; -use tui::style::{Color, Style}; -use tui::widgets::{Block, Borders, List, Paragraph, Text}; -use tui::Terminal; -use unicode_width::UnicodeWidthStr; - use crate::util::event::{Event, Events}; +use std::{ + error::Error, + io::{self, Write}, +}; +use termion::{ + cursor::Goto, event::Key, input::MouseTerminal, raw::IntoRawMode, screen::AlternateScreen, +}; +use tui::{ + backend::TermionBackend, + layout::{Constraint, Direction, Layout}, + style::{Color, Style}, + widgets::{Block, Borders, List, Paragraph, Text}, + Terminal, +}; +use unicode_width::UnicodeWidthStr; enum InputMode { Normal, @@ -54,7 +55,7 @@ impl Default for App { } } -fn main() -> Result<(), failure::Error> { +fn main() -> Result<(), Box> { // Terminal initialization let stdout = io::stdout().into_raw_mode()?; let stdout = MouseTerminal::from(stdout); diff --git a/src/backend/rustbox.rs b/src/backend/rustbox.rs index 6adecbf0..4bedf949 100644 --- a/src/backend/rustbox.rs +++ b/src/backend/rustbox.rs @@ -1,11 +1,11 @@ -use log::debug; +use crate::{ + backend::Backend, + buffer::Cell, + layout::Rect, + style::{Color, Modifier}, +}; use std::io; -use super::Backend; -use crate::buffer::Cell; -use crate::layout::Rect; -use crate::style::{Color, Modifier}; - pub struct RustboxBackend { rustbox: rustbox::RustBox, } @@ -30,9 +30,7 @@ impl Backend for RustboxBackend { where I: Iterator, { - let mut inst = 0; for (x, y, cell) in content { - inst += 1; self.rustbox.print( x as usize, y as usize, @@ -42,7 +40,6 @@ impl Backend for RustboxBackend { &cell.symbol, ); } - debug!("{} instructions outputed", inst); Ok(()) } fn hide_cursor(&mut self) -> Result<(), io::Error> { diff --git a/src/backend/termion.rs b/src/backend/termion.rs index 0aed8200..813a315c 100644 --- a/src/backend/termion.rs +++ b/src/backend/termion.rs @@ -1,4 +1,3 @@ -use log::debug; use std::fmt; use std::io; use std::io::Write; @@ -115,7 +114,6 @@ where string.push_str(&cell.symbol); inst += 1; } - debug!("{} instructions outputed.", inst); write!( self.stdout, "{}{}{}{}", diff --git a/src/terminal.rs b/src/terminal.rs index 6413bc3c..506f0740 100644 --- a/src/terminal.rs +++ b/src/terminal.rs @@ -1,4 +1,3 @@ -use log::error; use std::io; use crate::backend::Backend; @@ -65,7 +64,7 @@ where // Attempt to restore the cursor state if self.hidden_cursor { if let Err(err) = self.show_cursor() { - error!("Failed to show the cursor: {}", err); + eprintln!("Failed to show the cursor: {}", err); } } }