Fix cargo fmt

This commit is contained in:
Maxim Zhiburt
2022-01-31 19:12:01 +03:00
parent 9d45910632
commit 92658d5486
6 changed files with 141 additions and 193 deletions

View File

@@ -1,7 +1,7 @@
#[cfg(test)]
mod tests;
use heapless::{Vec, consts::U5};
use heapless::{consts::U5, Vec};
///The following are the implemented ANSI escape sequences. More to be added.
#[derive(Debug, PartialEq, Clone)]
@@ -64,114 +64,66 @@ impl Display for AnsiSequence {
use AnsiSequence::*;
match self {
Escape =>
write!(formatter, "\u{1b}"),
CursorPos(line, col)
=> write!(formatter, "[{};{}H", line, col),
CursorUp(amt)
=> write!(formatter, "[{}A", amt),
CursorDown(amt)
=> write!(formatter, "[{}B", amt),
CursorForward(amt)
=> write!(formatter, "[{}C", amt),
CursorBackward(amt)
=> write!(formatter, "[{}D", amt),
CursorSave
=> write!(formatter, "[s"),
CursorRestore
=> write!(formatter, "[u"),
EraseDisplay
=> write!(formatter, "[2J"),
EraseLine
=> write!(formatter, "[K"),
SetGraphicsMode(vec)
=> {
match vec.len() {
0 => write!(formatter, "[m"),
1 => write!(formatter, "[{}m", vec[0]),
2 => write!(formatter, "[{};{}m", vec[0], vec[1]),
3 => write!(formatter, "[{};{};{}m", vec[0], vec[1], vec[2]),
5 => write!(formatter, "[{};{};{};{};{}m", vec[0], vec[1],
vec[2], vec[3], vec[4]),
_ => unreachable!()
}
},
SetMode(mode)
=> write!(formatter, "[={}h", mode),
ResetMode(mode)
=> write!(formatter, "[={}l", mode),
ShowCursor
=> write!(formatter, "[?25h"),
HideCursor
=> write!(formatter, "[?25l"),
CursorToApp
=> write!(formatter, "[?1h"),
SetNewLineMode
=> write!(formatter, "[20h"),
SetCol132
=> write!(formatter, "[?3h"),
SetSmoothScroll
=> write!(formatter, "[?4h"),
SetReverseVideo
=> write!(formatter, "[?5h"),
SetOriginRelative
=> write!(formatter, "[?6h"),
SetAutoWrap
=> write!(formatter, "[?7h"),
SetAutoRepeat
=> write!(formatter, "[?8h"),
SetInterlacing
=> write!(formatter, "[?9h"),
SetLineFeedMode
=> write!(formatter, "[20l"),
SetCursorKeyToCursor
=> write!(formatter, "[?1l"),
SetVT52
=> write!(formatter, "[?2l"),
SetCol80
=> write!(formatter, "[?3l"),
SetJumpScrolling
=> write!(formatter, "[?4l"),
SetNormalVideo
=> write!(formatter, "[?5l"),
SetOriginAbsolute
=> write!(formatter, "[?6l"),
ResetAutoWrap
=> write!(formatter, "[?7l"),
ResetAutoRepeat
=> write!(formatter, "[?8l"),
ResetInterlacing
=> write!(formatter, "[?9l"),
SetAlternateKeypad
=> write!(formatter, "="),
SetNumericKeypad
=> write!(formatter, ">"),
SetUKG0
=> write!(formatter, "(A"),
SetUKG1
=> write!(formatter, ")A"),
SetUSG0
=> write!(formatter, "(B"),
SetUSG1
=> write!(formatter, ")B"),
SetG0SpecialChars
=> write!(formatter, "(0"),
SetG1SpecialChars
=> write!(formatter, ")0"),
SetG0AlternateChar
=> write!(formatter, "(1"),
SetG1AlternateChar
=> write!(formatter, ")1"),
SetG0AltAndSpecialGraph
=> write!(formatter, "(2"),
SetG1AltAndSpecialGraph
=> write!(formatter, ")2"),
SetSingleShift2
=> write!(formatter, "N"),
SetSingleShift3
=> write!(formatter, "O"),
SetTopAndBottom(x, y)
=> write!(formatter, "{};{}r", x, y)
Escape => write!(formatter, "\u{1b}"),
CursorPos(line, col) => write!(formatter, "[{};{}H", line, col),
CursorUp(amt) => write!(formatter, "[{}A", amt),
CursorDown(amt) => write!(formatter, "[{}B", amt),
CursorForward(amt) => write!(formatter, "[{}C", amt),
CursorBackward(amt) => write!(formatter, "[{}D", amt),
CursorSave => write!(formatter, "[s"),
CursorRestore => write!(formatter, "[u"),
EraseDisplay => write!(formatter, "[2J"),
EraseLine => write!(formatter, "[K"),
SetGraphicsMode(vec) => match vec.len() {
0 => write!(formatter, "[m"),
1 => write!(formatter, "[{}m", vec[0]),
2 => write!(formatter, "[{};{}m", vec[0], vec[1]),
3 => write!(formatter, "[{};{};{}m", vec[0], vec[1], vec[2]),
5 => write!(
formatter,
"[{};{};{};{};{}m",
vec[0], vec[1], vec[2], vec[3], vec[4]
),
_ => unreachable!(),
},
SetMode(mode) => write!(formatter, "[={}h", mode),
ResetMode(mode) => write!(formatter, "[={}l", mode),
ShowCursor => write!(formatter, "[?25h"),
HideCursor => write!(formatter, "[?25l"),
CursorToApp => write!(formatter, "[?1h"),
SetNewLineMode => write!(formatter, "[20h"),
SetCol132 => write!(formatter, "[?3h"),
SetSmoothScroll => write!(formatter, "[?4h"),
SetReverseVideo => write!(formatter, "[?5h"),
SetOriginRelative => write!(formatter, "[?6h"),
SetAutoWrap => write!(formatter, "[?7h"),
SetAutoRepeat => write!(formatter, "[?8h"),
SetInterlacing => write!(formatter, "[?9h"),
SetLineFeedMode => write!(formatter, "[20l"),
SetCursorKeyToCursor => write!(formatter, "[?1l"),
SetVT52 => write!(formatter, "[?2l"),
SetCol80 => write!(formatter, "[?3l"),
SetJumpScrolling => write!(formatter, "[?4l"),
SetNormalVideo => write!(formatter, "[?5l"),
SetOriginAbsolute => write!(formatter, "[?6l"),
ResetAutoWrap => write!(formatter, "[?7l"),
ResetAutoRepeat => write!(formatter, "[?8l"),
ResetInterlacing => write!(formatter, "[?9l"),
SetAlternateKeypad => write!(formatter, "="),
SetNumericKeypad => write!(formatter, ">"),
SetUKG0 => write!(formatter, "(A"),
SetUKG1 => write!(formatter, ")A"),
SetUSG0 => write!(formatter, "(B"),
SetUSG1 => write!(formatter, ")B"),
SetG0SpecialChars => write!(formatter, "(0"),
SetG1SpecialChars => write!(formatter, ")0"),
SetG0AlternateChar => write!(formatter, "(1"),
SetG1AlternateChar => write!(formatter, ")1"),
SetG0AltAndSpecialGraph => write!(formatter, "(2"),
SetG1AltAndSpecialGraph => write!(formatter, ")2"),
SetSingleShift2 => write!(formatter, "N"),
SetSingleShift3 => write!(formatter, "O"),
SetTopAndBottom(x, y) => write!(formatter, "{};{}r", x, y),
}
}
}
@@ -182,7 +134,7 @@ impl Display for AnsiSequence {
#[derive(Debug, PartialEq)]
pub enum Output<'a> {
TextBlock(&'a str),
Escape(AnsiSequence)
Escape(AnsiSequence),
}
impl<'a> Display for Output<'a> {
@@ -190,7 +142,7 @@ impl<'a> Display for Output<'a> {
use Output::*;
match self {
TextBlock(txt) => write!(formatter, "{}", txt),
Escape(seq) => write!(formatter, "{}", seq)
Escape(seq) => write!(formatter, "{}", seq),
}
}
}