Apply fixes from clippy 1.88

Author: djc

examples/keyboard.rs

@@ -12,7 +12,7 @@ fn main() -> io::Result<()> {
         } else {
             term.read_key()
         }?;
-        term.write_line(&format!("You pressed {:?}", key))?;
+        term.write_line(&format!("You pressed {key:?}"))?;
         if key == Key::Escape {
             break;
         }

examples/term.rs

@@ -23,7 +23,7 @@ fn do_stuff() -> io::Result<()> {
 
     write!(&term, "To edit: ")?;
     let res = term.read_line_initial_text("default")?;
-    writeln!(&term, "\n{}", res)?;
+    writeln!(&term, "\n{res}")?;
 
     Ok(())
 }

src/common_term.rs

@@ -4,30 +4,30 @@ use crate::term::Term;
 
 pub(crate) fn move_cursor_down(out: &Term, n: usize) -> io::Result<()> {
     if n > 0 {
-        out.write_str(&format!("\x1b[{}B", n))
+        out.write_str(&format!("\x1b[{n}B"))
     } else {
         Ok(())
     }
 }
 
 pub(crate) fn move_cursor_up(out: &Term, n: usize) -> io::Result<()> {
     if n > 0 {
-        out.write_str(&format!("\x1b[{}A", n))
+        out.write_str(&format!("\x1b[{n}A"))
     } else {
         Ok(())
     }
 }
 pub(crate) fn move_cursor_left(out: &Term, n: usize) -> io::Result<()> {
     if n > 0 {
-        out.write_str(&format!("\x1b[{}D", n))
+        out.write_str(&format!("\x1b[{n}D"))
     } else {
         Ok(())
     }
 }
 
 pub(crate) fn move_cursor_right(out: &Term, n: usize) -> io::Result<()> {
     if n > 0 {
-        out.write_str(&format!("\x1b[{}C", n))
+        out.write_str(&format!("\x1b[{n}C"))
     } else {
         Ok(())
     }
@@ -40,7 +40,7 @@ pub(crate) fn move_cursor_to(out: &Term, x: usize, y: usize) -> io::Result<()> {
 
 pub(crate) fn clear_chars(out: &Term, n: usize) -> io::Result<()> {
     if n > 0 {
-        out.write_str(&format!("\x1b[{}D\x1b[0K", n))
+        out.write_str(&format!("\x1b[{n}D\x1b[0K"))
     } else {
         Ok(())
     }

src/term.rs

@@ -351,7 +351,7 @@ impl Term {
                         slf.flush()?;
                     }
                     Key::Enter => {
-                        slf.write_through(format!("\n{}", initial).as_bytes())?;
+                        slf.write_through(format!("\n{initial}").as_bytes())?;
                         break;
                     }
                     _ => (),

src/unix_term.rs

@@ -390,5 +390,5 @@ pub(crate) fn wants_emoji() -> bool {
 }
 
 pub(crate) fn set_title<T: Display>(title: T) {
-    print!("\x1b]0;{}\x07", title);
+    print!("\x1b]0;{title}\x07");
 }

src/utils.rs

@@ -1068,7 +1068,7 @@ fn test_attributes_single() {
         let attrs = Attributes::new().insert(attr);
         assert_eq!(attrs.bits().collect::<Vec<_>>(), [attr as u16]);
         assert_eq!(attrs.attrs().collect::<Vec<_>>(), [attr]);
-        assert_eq!(format!("{:?}", attrs), format!("{{{:?}}}", attr));
+        assert_eq!(format!("{attrs:?}"), format!("{{{:?}}}", attr));
     }
 }
 

src/windows_term/mod.rs

@@ -469,8 +469,7 @@ pub(crate) fn read_single_key(ctrlc_key: bool) -> io::Result<Key> {
                     // (This error is given when reading a non-UTF8 file into a String, for example.)
                     Err(e) => {
                         let message = format!(
-                            "Read invalid surrogate pair ({}, {}): {}",
-                            unicode_char, next_surrogate, e
+                            "Read invalid surrogate pair ({unicode_char}, {next_surrogate}): {e}",
                         );
                         Err(io::Error::new(io::ErrorKind::InvalidData, message))
                     }
@@ -480,7 +479,7 @@ pub(crate) fn read_single_key(ctrlc_key: bool) -> io::Result<Key> {
             // Return an InvalidData error. This is the recommended value for UTF-related I/O errors.
             // (This error is given when reading a non-UTF8 file into a String, for example.)
             Err(e) => {
-                let message = format!("Read invalid utf16 {}: {}", unicode_char, e);
+                let message = format!("Read invalid utf16 {unicode_char}: {e}");
                 Err(io::Error::new(io::ErrorKind::InvalidData, message))
             }
         }
@@ -615,7 +614,7 @@ pub(crate) fn msys_tty_on(term: &Term) -> bool {
 }
 
 pub(crate) fn set_title<T: Display>(title: T) {
-    let buffer: Vec<u16> = OsStr::new(&format!("{}", title))
+    let buffer: Vec<u16> = OsStr::new(&format!("{title}"))
         .encode_wide()
         .chain(once(0))
         .collect();