From dfc67e54c8cde921d32c1392f6ed28fc14ac541e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Cruz?= Date: Sun, 23 Apr 2023 12:41:00 +0200 Subject: [PATCH] Fix interactive-demo (#783) --- examples/interactive-demo/src/main.rs | 2 +- examples/interactive-demo/src/test/attribute.rs | 6 ++++-- examples/interactive-demo/src/test/color.rs | 1 - examples/interactive-demo/src/test/cursor.rs | 5 ++--- examples/interactive-demo/src/test/event.rs | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/interactive-demo/src/main.rs b/examples/interactive-demo/src/main.rs index 4b06efd8..5eb1c731 100644 --- a/examples/interactive-demo/src/main.rs +++ b/examples/interactive-demo/src/main.rs @@ -94,7 +94,7 @@ pub fn read_char() -> std::io::Result { } } -pub fn buffer_size() -> io::Result<(u16> { +pub fn buffer_size() -> io::Result<(u16, u16)> { terminal::size() } diff --git a/examples/interactive-demo/src/test/attribute.rs b/examples/interactive-demo/src/test/attribute.rs index e446063a..6c067528 100644 --- a/examples/interactive-demo/src/test/attribute.rs +++ b/examples/interactive-demo/src/test/attribute.rs @@ -7,8 +7,10 @@ const ATTRIBUTES: [(style::Attribute, style::Attribute); 10] = [ (style::Attribute::Bold, style::Attribute::NormalIntensity), (style::Attribute::Italic, style::Attribute::NoItalic), (style::Attribute::Underlined, style::Attribute::NoUnderline), - - (style::Attribute::DoubleUnderlined, style::Attribute::NoUnderline), + ( + style::Attribute::DoubleUnderlined, + style::Attribute::NoUnderline, + ), (style::Attribute::Undercurled, style::Attribute::NoUnderline), (style::Attribute::Underdotted, style::Attribute::NoUnderline), (style::Attribute::Underdashed, style::Attribute::NoUnderline), diff --git a/examples/interactive-demo/src/test/color.rs b/examples/interactive-demo/src/test/color.rs index dc37d3ba..d34ac457 100644 --- a/examples/interactive-demo/src/test/color.rs +++ b/examples/interactive-demo/src/test/color.rs @@ -1,6 +1,5 @@ #![allow(clippy::cognitive_complexity)] -use crate::Result; use crossterm::{cursor, queue, style, style::Color}; use std::io::Write; diff --git a/examples/interactive-demo/src/test/cursor.rs b/examples/interactive-demo/src/test/cursor.rs index 07296d83..9ad10d56 100644 --- a/examples/interactive-demo/src/test/cursor.rs +++ b/examples/interactive-demo/src/test/cursor.rs @@ -2,7 +2,7 @@ use std::io::Write; -use crossterm::{cursor, execute, queue, style, Command, style::Stylize}; +use crossterm::{cursor, execute, queue, style, style::Stylize, Command}; use std::thread; use std::time::Duration; @@ -109,7 +109,6 @@ where ) } - fn test_move_cursor_to(w: &mut W) -> std::io::Result<()> where W: Write, @@ -171,7 +170,7 @@ where queue!( w, cursor::MoveTo(column, row), - style::PrintStyledContent("▓".red()), + style::PrintStyledContent("▓".red()), )?; } else { queue!( diff --git a/examples/interactive-demo/src/test/event.rs b/examples/interactive-demo/src/test/event.rs index 786e9ff0..50a797e2 100644 --- a/examples/interactive-demo/src/test/event.rs +++ b/examples/interactive-demo/src/test/event.rs @@ -5,7 +5,7 @@ use crossterm::{ event::{read, DisableMouseCapture, EnableMouseCapture, Event, KeyCode}, execute, }; -use std::io; +use std::io::{self, Write}; fn test_event(w: &mut W) -> io::Result<()> where