Apply fixes from clippy 1.88

djc · djc · commit 12b1f44daf4c · 2025-06-26T21:43:24.000+02:00
diff --git a/examples/keyboard.rs b/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;
         }
diff --git a/examples/term.rs b/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(())
 }
diff --git a/src/common_term.rs b/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(())
     }
diff --git a/src/term.rs b/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;
                     }
                     _ => (),
diff --git a/src/unix_term.rs b/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");
 }
diff --git a/src/utils.rs b/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));
     }
 }
 
diff --git a/src/windows_term/mod.rs b/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();

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ fn main() -> io::Result<()> {`
`12`	`12`	`} else {`
`13`	`13`	`term.read_key()`
`14`	`14`	`}?;`
`15`		`- term.write_line(&format!("You pressed {:?}", key))?;`
	`15`	`+ term.write_line(&format!("You pressed {key:?}"))?;`
`16`	`16`	`if key == Key::Escape {`
`17`	`17`	`break;`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ fn do_stuff() -> io::Result<()> {`
`23`	`23`
`24`	`24`	`write!(&term, "To edit: ")?;`
`25`	`25`	`let res = term.read_line_initial_text("default")?;`
`26`		`- writeln!(&term, "\n{}", res)?;`
	`26`	`+ writeln!(&term, "\n{res}")?;`
`27`	`27`
`28`	`28`	`Ok(())`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,30 +4,30 @@ use crate::term::Term;`
`4`	`4`
`5`	`5`	`pub(crate) fn move_cursor_down(out: &Term, n: usize) -> io::Result<()> {`
`6`	`6`	`if n > 0 {`
`7`		`- out.write_str(&format!("\x1b[{}B", n))`
	`7`	`+ out.write_str(&format!("\x1b[{n}B"))`
`8`	`8`	`} else {`
`9`	`9`	`Ok(())`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`pub(crate) fn move_cursor_up(out: &Term, n: usize) -> io::Result<()> {`
`14`	`14`	`if n > 0 {`
`15`		`- out.write_str(&format!("\x1b[{}A", n))`
	`15`	`+ out.write_str(&format!("\x1b[{n}A"))`
`16`	`16`	`} else {`
`17`	`17`	`Ok(())`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`	`pub(crate) fn move_cursor_left(out: &Term, n: usize) -> io::Result<()> {`
`21`	`21`	`if n > 0 {`
`22`		`- out.write_str(&format!("\x1b[{}D", n))`
	`22`	`+ out.write_str(&format!("\x1b[{n}D"))`
`23`	`23`	`} else {`
`24`	`24`	`Ok(())`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`pub(crate) fn move_cursor_right(out: &Term, n: usize) -> io::Result<()> {`
`29`	`29`	`if n > 0 {`
`30`		`- out.write_str(&format!("\x1b[{}C", n))`
	`30`	`+ out.write_str(&format!("\x1b[{n}C"))`
`31`	`31`	`} else {`
`32`	`32`	`Ok(())`
`33`	`33`	`}`
`@@ -40,7 +40,7 @@ pub(crate) fn move_cursor_to(out: &Term, x: usize, y: usize) -> io::Result<()> {`
`40`	`40`
`41`	`41`	`pub(crate) fn clear_chars(out: &Term, n: usize) -> io::Result<()> {`
`42`	`42`	`if n > 0 {`
`43`		`- out.write_str(&format!("\x1b[{}D\x1b[0K", n))`
	`43`	`+ out.write_str(&format!("\x1b[{n}D\x1b[0K"))`
`44`	`44`	`} else {`
`45`	`45`	`Ok(())`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ impl Term {`
`351`	`351`	`slf.flush()?;`
`352`	`352`	`}`
`353`	`353`	`Key::Enter => {`
`354`		`- slf.write_through(format!("\n{}", initial).as_bytes())?;`
	`354`	`+ slf.write_through(format!("\n{initial}").as_bytes())?;`
`355`	`355`	`break;`
`356`	`356`	`}`
`357`	`357`	`_ => (),`
Original file line number	Diff line number	Diff line change
`@@ -390,5 +390,5 @@ pub(crate) fn wants_emoji() -> bool {`
`390`	`390`	`}`
`391`	`391`
`392`	`392`	`pub(crate) fn set_title<T: Display>(title: T) {`
`393`		`- print!("\x1b]0;{}\x07", title);`
	`393`	`+ print!("\x1b]0;{title}\x07");`
`394`	`394`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1068,7 +1068,7 @@ fn test_attributes_single() {`
`1068`	`1068`	`let attrs = Attributes::new().insert(attr);`
`1069`	`1069`	`assert_eq!(attrs.bits().collect::<Vec<_>>(), [attr as u16]);`
`1070`	`1070`	`assert_eq!(attrs.attrs().collect::<Vec<_>>(), [attr]);`
`1071`		`- assert_eq!(format!("{:?}", attrs), format!("{{{:?}}}", attr));`
	`1071`	`+ assert_eq!(format!("{attrs:?}"), format!("{{{:?}}}", attr));`
`1072`	`1072`	`}`
`1073`	`1073`	`}`
`1074`	`1074`