appease latest Clippy warnings (1.89)

Author: apparebit

crates/prettytty/src/api.rs

@@ -463,7 +463,7 @@ pub trait Scan: std::io::BufRead {
     /// connection upon invocation. For text tokens, it performs no further
     /// reads. That is, a text token always ends with the currently buffered
     /// data.
-    fn read_token(&mut self) -> Result<Token>;
+    fn read_token(&mut self) -> Result<Token<'_>>;
 
     /// Read the next token as a control sequence.
     ///
@@ -491,7 +491,7 @@ impl<S: Scan + ?Sized> Scan for &mut S {
     }
 
     #[inline]
-    fn read_token(&mut self) -> Result<Token> {
+    fn read_token(&mut self) -> Result<Token<'_>> {
         (**self).read_token()
     }
 }
@@ -504,7 +504,7 @@ impl<S: Scan + ?Sized> Scan for Box<S> {
     }
 
     #[inline]
-    fn read_token(&mut self) -> Result<Token> {
+    fn read_token(&mut self) -> Result<Token<'_>> {
         (**self).read_token()
     }
 }

crates/prettytty/src/conn.rs

@@ -166,7 +166,7 @@ impl Connection {
     /// to the terminal's input and output, respectively. Dropping them releases
     /// access again.
     #[inline]
-    pub fn io(&self) -> (Input, Output) {
+    pub fn io(&self) -> (Input<'_>, Output<'_>) {
         (self.input(), self.output())
     }
 
@@ -179,7 +179,7 @@ impl Connection {
     ///
     /// If the underlying mutex has been poisoned.
     #[inline]
-    pub fn input(&self) -> Input {
+    pub fn input(&self) -> Input<'_> {
         Input {
             scanner: self.scanner.lock().expect("can't lock poisoned mutex"),
         }
@@ -194,7 +194,7 @@ impl Connection {
     ///
     /// If the underlying mutex has been poisoned.
     #[inline]
-    pub fn output(&self) -> Output {
+    pub fn output(&self) -> Output<'_> {
         Output {
             writer: self.writer.lock().expect("can't lock poisoned mutex"),
         }
@@ -325,7 +325,7 @@ impl Scan for Input<'_> {
     }
 
     #[inline]
-    fn read_token(&mut self) -> Result<crate::Token> {
+    fn read_token(&mut self) -> Result<crate::Token<'_>> {
         self.scanner.read_token().map_err(core::convert::Into::into)
     }
 }

crates/prettytty/src/err.rs

@@ -144,7 +144,7 @@ impl From<Error> for std::io::Error {
                 if let Some(error) = value.source {
                     error
                 } else {
-                    Self::new(std::io::ErrorKind::Other, value)
+                    Self::other(value)
                 }
             }
         }

crates/prettytty/src/scan.rs

@@ -268,14 +268,14 @@ impl<R: std::io::Read> Scanner<R> {
 
     /// Create a control token for the byte.
     #[inline]
-    fn new_control_token(&mut self, byte: u8) -> Result<Token, Error> {
+    fn new_control_token(&mut self, byte: u8) -> Result<Token<'_>, Error> {
         self.extra[0] = byte;
         Ok(Token::Control(&self.extra))
     }
 
     /// Create a new sequence token.
     #[inline]
-    fn new_sequence_token(&self) -> Result<Token, Error> {
+    fn new_sequence_token(&self) -> Result<Token<'_>, Error> {
         if self.did_overflow {
             Err(ErrorKind::OutOfMemory.into())
         } else {
@@ -289,7 +289,7 @@ impl<R: std::io::Read> Scanner<R> {
     // ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
 
     /// Read the next token.
-    pub fn read_token(&mut self) -> Result<Token, Error> {
+    pub fn read_token(&mut self) -> Result<Token<'_>, Error> {
         loop {
             // Make sure that we have some bytes to process
             if let Some(0) = self.ensure_readable()? {

crates/prettytty/src/util.rs

@@ -238,6 +238,9 @@ impl ByteFormat<'_> {
         Ok(characters)
     }
 
+    // Grr, if I add the annotation to the offending for loop over pairs, it is
+    // ineffective.
+    #[allow(clippy::missing_asserts_for_indexing)]
     fn render_hexdump<W>(bytes: &[u8], writer: &mut W) -> Result<usize, fmt::Error>
     where
         W: fmt::Write + ?Sized,
@@ -257,12 +260,11 @@ impl ByteFormat<'_> {
 
             for pair in chunk.chunks(2) {
                 // Allow for uneven number of bytes in final chunk.
-                assert!(!pair.is_empty(), "chunk must not be empty");
+                write!(writer, "{:02x}", pair[0])?;
                 if pair.len() == 1 {
-                    write!(writer, "{:02x}   ", pair[0])?;
+                    write!(writer, "   ")?;
                 } else {
-                    assert!(pair.len() == 2, "chunk has two elements");
-                    write!(writer, "{:02x}{:02x} ", pair[0], pair[1])?;
+                    write!(writer, "{:02x} ", pair[1])?;
                 }
                 characters += 5;
             }