From 55e6cf066b0e606eaa89a59e4406d35a324c1fb8 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Sat, 13 Nov 2021 14:39:36 -0500
Subject: clippy

---
 src/lib.rs     |  8 ++------
 src/private.rs | 12 ++++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index da0d6dc..2f3f0c8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -148,16 +148,14 @@ pub trait Textmode: private::Output {
                 if i < 8 {
                     self.write(b"\x1b[");
                     self.write_u8(30 + i);
-                    self.write(b"m");
                 } else if i < 16 {
                     self.write(b"\x1b[");
                     self.write_u8(82 + i);
-                    self.write(b"m");
                 } else {
                     self.write(b"\x1b[38;5;");
                     self.write_u8(i);
-                    self.write(b"m");
                 }
+                self.write(b"m");
             }
             vt100::Color::Rgb(r, g, b) => {
                 self.write(b"\x1b[38;2;");
@@ -182,16 +180,14 @@ pub trait Textmode: private::Output {
                 if i < 8 {
                     self.write(b"\x1b[");
                     self.write_u8(40 + i);
-                    self.write(b"m");
                 } else if i < 16 {
                     self.write(b"\x1b[");
                     self.write_u8(92 + i);
-                    self.write(b"m");
                 } else {
                     self.write(b"\x1b[48;5;");
                     self.write_u8(i);
-                    self.write(b"m");
                 }
+                self.write(b"m");
             }
             vt100::Color::Rgb(r, g, b) => {
                 self.write(b"\x1b[48;2;");
diff --git a/src/private.rs b/src/private.rs
index 07dbb4c..ef3d47a 100644
--- a/src/private.rs
+++ b/src/private.rs
@@ -180,8 +180,8 @@ pub trait Input {
 
         enum EscapeState {
             Escape,
-            CSI(Vec<u8>),
-            CKM,
+            Csi(Vec<u8>),
+            Ckm,
         }
 
         let mut state = EscapeState::Escape;
@@ -192,14 +192,14 @@ pub trait Input {
                 EscapeState::Escape => match c {
                     b'[' => {
                         if self.should_parse_special_keys() {
-                            state = EscapeState::CSI(vec![]);
+                            state = EscapeState::Csi(vec![]);
                         } else {
                             fail!()
                         }
                     }
                     b'O' => {
                         if self.should_parse_special_keys() {
-                            state = EscapeState::CKM;
+                            state = EscapeState::Ckm;
                         } else {
                             fail!()
                         }
@@ -213,7 +213,7 @@ pub trait Input {
                     }
                     _ => fail!(),
                 },
-                EscapeState::CSI(ref mut param) => match c {
+                EscapeState::Csi(ref mut param) => match c {
                     b'A' => return Ok(Some(crate::Key::Up)),
                     b'B' => return Ok(Some(crate::Key::Down)),
                     b'C' => return Ok(Some(crate::Key::Right)),
@@ -246,7 +246,7 @@ pub trait Input {
                     },
                     _ => fail!(),
                 },
-                EscapeState::CKM => match c {
+                EscapeState::Ckm => match c {
                     b'A' => return Ok(Some(crate::Key::KeypadUp)),
                     b'B' => return Ok(Some(crate::Key::KeypadDown)),
                     b'C' => return Ok(Some(crate::Key::KeypadRight)),
-- 
cgit v1.2.3-54-g00ecf