From b922f95463e316a8aa59750507d0a77889b59878 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Wed, 15 Dec 2021 02:25:44 -0500
Subject: be a bit less aggressive

---
 src/blocking/input.rs |  8 ++++----
 src/input.rs          | 14 ++++++--------
 src/lib.rs            |  4 +---
 src/private.rs        |  8 ++++----
 4 files changed, 15 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/blocking/input.rs b/src/blocking/input.rs
index 2d154c6..48d9ee8 100644
--- a/src/blocking/input.rs
+++ b/src/blocking/input.rs
@@ -80,11 +80,11 @@ pub struct Input {
 
 impl crate::private::Input for Input {
     fn buf(&self) -> &[u8] {
-        self.buf.get(self.pos..).unwrap()
+        &self.buf[self.pos..]
     }
 
     fn buf_mut(&mut self) -> &mut [u8] {
-        self.buf.get_mut(self.pos..).unwrap()
+        &mut self.buf[self.pos..]
     }
 
     fn buf_mut_vec(&mut self) -> &mut Vec<u8> {
@@ -249,12 +249,12 @@ impl Input {
 
         if self.parse_utf8 {
             let expected_bytes =
-                self.expected_leading_utf8_bytes(*self.buf().get(0).unwrap());
+                self.expected_leading_utf8_bytes(self.buf()[0]);
             if self.buf.len() < self.pos + expected_bytes {
                 let mut cur = self.buf.len();
                 self.buf.resize(4096 + expected_bytes, 0);
                 while cur < self.pos + expected_bytes {
-                    let bytes = read_stdin(self.buf.get_mut(cur..).unwrap())?;
+                    let bytes = read_stdin(&mut self.buf[cur..])?;
                     if bytes == 0 {
                         return Ok(());
                     }
diff --git a/src/input.rs b/src/input.rs
index 961fc51..90213ec 100644
--- a/src/input.rs
+++ b/src/input.rs
@@ -96,11 +96,11 @@ pub struct Input {
 
 impl crate::private::Input for Input {
     fn buf(&self) -> &[u8] {
-        self.buf.get(self.pos..).unwrap()
+        &self.buf[self.pos..]
     }
 
     fn buf_mut(&mut self) -> &mut [u8] {
-        self.buf.get_mut(self.pos..).unwrap()
+        &mut self.buf[self.pos..]
     }
 
     fn buf_mut_vec(&mut self) -> &mut Vec<u8> {
@@ -268,16 +268,14 @@ impl Input {
 
         if self.parse_utf8 {
             let expected_bytes =
-                self.expected_leading_utf8_bytes(*self.buf().get(0).unwrap());
+                self.expected_leading_utf8_bytes(self.buf()[0]);
             if self.buf.len() < self.pos + expected_bytes {
                 let mut cur = self.buf.len();
                 self.buf.resize(4096 + expected_bytes, 0);
                 while cur < self.pos + expected_bytes {
-                    let bytes = read_stdin(
-                        &mut self.stdin,
-                        self.buf.get_mut(cur..).unwrap(),
-                    )
-                    .await?;
+                    let bytes =
+                        read_stdin(&mut self.stdin, &mut self.buf[cur..])
+                            .await?;
                     if bytes == 0 {
                         return Ok(());
                     }
diff --git a/src/lib.rs b/src/lib.rs
index 93dfc36..e9ef277 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -66,9 +66,7 @@
 #![warn(clippy::cargo)]
 #![warn(clippy::pedantic)]
 #![warn(clippy::nursery)]
-#![warn(clippy::unwrap_used)]
-#![warn(clippy::expect_used)]
-#![warn(clippy::indexing_slicing)]
+#![warn(clippy::get_unwrap)]
 #![warn(clippy::as_conversions)]
 #![allow(clippy::cognitive_complexity)]
 #![allow(clippy::missing_const_for_fn)]
diff --git a/src/private.rs b/src/private.rs
index ed69aa5..add5aa1 100644
--- a/src/private.rs
+++ b/src/private.rs
@@ -6,12 +6,12 @@ pub trait Output {
 
     fn write_u16(&mut self, i: u16) {
         // vt100::Parser::write can never fail
-        itoa::write(self.next_mut(), i).unwrap_or_else(|_| unreachable!());
+        itoa::write(self.next_mut(), i).unwrap();
     }
 
     fn write_u8(&mut self, i: u8) {
         // vt100::Parser::write can never fail
-        itoa::write(self.next_mut(), i).unwrap_or_else(|_| unreachable!());
+        itoa::write(self.next_mut(), i).unwrap();
     }
 }
 
@@ -308,7 +308,7 @@ pub trait Input {
                 // buf always contains at least the initial character, and we
                 // have already done the parsing to ensure that it contains a
                 // valid utf8 character before getting here
-                s.chars().next().unwrap_or_else(|| unreachable!()),
+                s.chars().next().unwrap(),
             )),
             Err(e) => {
                 buf = e.into_bytes();
@@ -329,7 +329,7 @@ pub trait Input {
             self.buf_mut_vec().insert(0, c);
         } else {
             self.unconsume(1);
-            *self.buf_mut().get_mut(0).unwrap() = c;
+            self.buf_mut()[0] = c;
         }
     }
 
-- 
cgit v1.2.3-54-g00ecf