Remove cstr! macro in favor of literal notation

Also apply clippy changes while at it.

Closes #8002.

3 files changed, 52 insertions, 53 deletions

diff --git a/alacritty_terminal/src/event_loop.rs b/alacritty_terminal/src/event_loop.rs
index 285c08e2..2d00389f 100644
--- a/alacritty_terminal/src/event_loop.rs
+++ b/alacritty_terminal/src/event_loop.rs
@@ -212,7 +212,7 @@ where
 
             // Register TTY through EventedRW interface.
             if let Err(err) = unsafe { self.pty.register(&self.poll, interest, poll_opts) } {
-                error!("Event loop registration error: {}", err);
+                error!("Event loop registration error: {err}");
                 return (self, state);
             }
 
@@ -235,7 +235,7 @@ where
                     match err.kind() {
                         ErrorKind::Interrupted => continue,
                         _ => {
-                            error!("Event loop polling error: {}", err);
+                            error!("Event loop polling error: {err}");
                             break 'event_loop;
                         },
                     }
@@ -289,14 +289,14 @@ where
                                         continue;
                                     }
 
-                                    error!("Error reading from PTY in event loop: {}", err);
+                                    error!("Error reading from PTY in event loop: {err}");
                                     break 'event_loop;
                                 }
                             }
 
                             if event.writable {
                                 if let Err(err) = self.pty_write(&mut state) {
-                                    error!("Error writing to PTY in event loop: {}", err);
+                                    error!("Error writing to PTY in event loop: {err}");
                                     break 'event_loop;
                                 }
                             }
diff --git a/alacritty_terminal/src/term/mod.rs b/alacritty_terminal/src/term/mod.rs
index 84945f52..37c27a24 100644
--- a/alacritty_terminal/src/term/mod.rs
+++ b/alacritty_terminal/src/term/mod.rs
@@ -664,7 +664,7 @@ impl<T> Term<T> {
             return;
         }
 
-        debug!("New num_cols is {} and num_lines is {}", num_cols, num_lines);
+        debug!("New num_cols is {num_cols} and num_lines is {num_lines}");
 
         // Move vi mode cursor with the content.
         let history_size = self.history_size();
@@ -740,7 +740,7 @@ impl<T> Term<T> {
     /// Expects origin to be in scroll range.
     #[inline]
     fn scroll_down_relative(&mut self, origin: Line, mut lines: usize) {
-        trace!("Scrolling down relative: origin={}, lines={}", origin, lines);
+        trace!("Scrolling down relative: origin={origin}, lines={lines}");
 
         lines = cmp::min(lines, (self.scroll_region.end - self.scroll_region.start).0 as usize);
         lines = cmp::min(lines, (self.scroll_region.end - origin).0 as usize);
@@ -768,7 +768,7 @@ impl<T> Term<T> {
     /// Expects origin to be in scroll range.
     #[inline]
     fn scroll_up_relative(&mut self, origin: Line, mut lines: usize) {
-        trace!("Scrolling up relative: origin={}, lines={}", origin, lines);
+        trace!("Scrolling up relative: origin={origin}, lines={lines}");
 
         lines = cmp::min(lines, (self.scroll_region.end - self.scroll_region.start).0 as usize);
 
@@ -1157,7 +1157,7 @@ impl<T: EventListener> Handler for Term<T> {
         let line = Line(line);
         let col = Column(col);
 
-        trace!("Going to: line={}, col={}", line, col);
+        trace!("Going to: line={line}, col={col}");
         let (y_offset, max_y) = if self.mode.contains(TermMode::ORIGIN) {
             (self.scroll_region.start, self.scroll_region.end - 1)
         } else {
@@ -1173,13 +1173,13 @@ impl<T: EventListener> Handler for Term<T> {
 
     #[inline]
     fn goto_line(&mut self, line: i32) {
-        trace!("Going to line: {}", line);
+        trace!("Going to line: {line}");
         self.goto(line, self.grid.cursor.point.column.0)
     }
 
     #[inline]
     fn goto_col(&mut self, col: usize) {
-        trace!("Going to column: {}", col);
+        trace!("Going to column: {col}");
         self.goto(self.grid.cursor.point.line.0, col)
     }
 
@@ -1213,7 +1213,7 @@ impl<T: EventListener> Handler for Term<T> {
 
     #[inline]
     fn move_up(&mut self, lines: usize) {
-        trace!("Moving up: {}", lines);
+        trace!("Moving up: {lines}");
 
         let line = self.grid.cursor.point.line - lines;
         let column = self.grid.cursor.point.column;
@@ -1222,7 +1222,7 @@ impl<T: EventListener> Handler for Term<T> {
 
     #[inline]
     fn move_down(&mut self, lines: usize) {
-        trace!("Moving down: {}", lines);
+        trace!("Moving down: {lines}");
 
         let line = self.grid.cursor.point.line + lines;
         let column = self.grid.cursor.point.column;
@@ -1231,7 +1231,7 @@ impl<T: EventListener> Handler for Term<T> {
 
     #[inline]
     fn move_forward(&mut self, cols: usize) {
-        trace!("Moving forward: {}", cols);
+        trace!("Moving forward: {cols}");
         let last_column = cmp::min(self.grid.cursor.point.column + cols, self.last_column());
 
         let cursor_line = self.grid.cursor.point.line.0 as usize;
@@ -1243,7 +1243,7 @@ impl<T: EventListener> Handler for Term<T> {
 
     #[inline]
     fn move_backward(&mut self, cols: usize) {
-        trace!("Moving backward: {}", cols);
+        trace!("Moving backward: {cols}");
         let column = self.grid.cursor.point.column.saturating_sub(cols);
 
         let cursor_line = self.grid.cursor.point.line.0 as usize;
@@ -1295,8 +1295,8 @@ impl<T: EventListener> Handler for Term<T> {
         if self.keyboard_mode_stack.len() >= KEYBOARD_MODE_STACK_MAX_DEPTH {
             let removed = self.title_stack.remove(0);
             trace!(
-                "Removing '{:?}' from bottom of keyboard mode stack that exceeds its maximum depth",
-                removed
+                "Removing '{removed:?}' from bottom of keyboard mode stack that exceeds its \
+                 maximum depth"
             );
         }
 
@@ -1330,7 +1330,7 @@ impl<T: EventListener> Handler for Term<T> {
 
     #[inline]
     fn device_status(&mut self, arg: usize) {
-        trace!("Reporting device status: {}", arg);
+        trace!("Reporting device status: {arg}");
         match arg {
             5 => {
                 let text = String::from("\x1b[0n");
@@ -1341,13 +1341,13 @@ impl<T: EventListener> Handler for Term<T> {
                 let text = format!("\x1b[{};{}R", pos.line + 1, pos.column + 1);
                 self.event_proxy.send_event(Event::PtyWrite(text));
             },
-            _ => debug!("unknown device status query: {}", arg),
+            _ => debug!("unknown device status query: {arg}"),
         };
     }
 
     #[inline]
     fn move_down_and_cr(&mut self, lines: usize) {
-        trace!("Moving down and cr: {}", lines);
+        trace!("Moving down and cr: {lines}");
 
         let line = self.grid.cursor.point.line + lines;
         self.goto(line.0, 0)
@@ -1355,7 +1355,7 @@ impl<T: EventListener> Handler for Term<T> {
 
     #[inline]
     fn move_up_and_cr(&mut self, lines: usize) {
-        trace!("Moving up and cr: {}", lines);
+        trace!("Moving up and cr: {lines}");
 
         let line = self.grid.cursor.point.line - lines;
         self.goto(line.0, 0)
@@ -1495,7 +1495,7 @@ impl<T: EventListener> Handler for Term<T> {
 
     #[inline]
     fn insert_blank_lines(&mut self, lines: usize) {
-        trace!("Inserting blank {} lines", lines);
+        trace!("Inserting blank {lines} lines");
 
         let origin = self.grid.cursor.point.line;
         if self.scroll_region.contains(&origin) {
@@ -1508,7 +1508,7 @@ impl<T: EventListener> Handler for Term<T> {
         let origin = self.grid.cursor.point.line;
         let lines = cmp::min(self.screen_lines() - origin.0 as usize, lines);
 
-        trace!("Deleting {} lines", lines);
+        trace!("Deleting {lines} lines");
 
         if lines > 0 && self.scroll_region.contains(&origin) {
             self.scroll_up_relative(origin, lines);
@@ -1565,7 +1565,7 @@ impl<T: EventListener> Handler for Term<T> {
 
     #[inline]
     fn move_backward_tabs(&mut self, count: u16) {
-        trace!("Moving backward {} tabs", count);
+        trace!("Moving backward {count} tabs");
 
         let old_col = self.grid.cursor.point.column.0;
         for _ in 0..count {
@@ -1590,7 +1590,7 @@ impl<T: EventListener> Handler for Term<T> {
 
     #[inline]
     fn move_forward_tabs(&mut self, count: u16) {
-        trace!("Moving forward {} tabs", count);
+        trace!("Moving forward {count} tabs");
 
         let num_cols = self.columns();
         let old_col = self.grid.cursor.point.column.0;
@@ -1633,7 +1633,7 @@ impl<T: EventListener> Handler for Term<T> {
 
     #[inline]
     fn clear_line(&mut self, mode: ansi::LineClearMode) {
-        trace!("Clearing line: {:?}", mode);
+        trace!("Clearing line: {mode:?}");
 
         let cursor = &self.grid.cursor;
         let bg = cursor.template.bg;
@@ -1660,7 +1660,7 @@ impl<T: EventListener> Handler for Term<T> {
     /// Set the indexed color value.
     #[inline]
     fn set_color(&mut self, index: usize, color: Rgb) {
-        trace!("Setting color[{}] = {:?}", index, color);
+        trace!("Setting color[{index}] = {color:?}");
 
         // Damage terminal if the color changed and it's not the cursor.
         if index != NamedColor::Cursor as usize && self.colors[index] != Some(color) {
@@ -1673,7 +1673,7 @@ impl<T: EventListener> Handler for Term<T> {
     /// Respond to a color query escape sequence.
     #[inline]
     fn dynamic_color_sequence(&mut self, prefix: String, index: usize, terminator: &str) {
-        trace!("Requested write of escape sequence for color code {}: color[{}]", prefix, index);
+        trace!("Requested write of escape sequence for color code {prefix}: color[{index}]");
 
         let terminator = terminator.to_owned();
         self.event_proxy.send_event(Event::ColorRequest(
@@ -1690,7 +1690,7 @@ impl<T: EventListener> Handler for Term<T> {
     /// Reset the indexed color to original value.
     #[inline]
     fn reset_color(&mut self, index: usize) {
-        trace!("Resetting color[{}]", index);
+        trace!("Resetting color[{index}]");
 
         // Damage terminal if the color changed and it's not the cursor.
         if index != NamedColor::Cursor as usize && self.colors[index].is_some() {
@@ -1748,7 +1748,7 @@ impl<T: EventListener> Handler for Term<T> {
 
     #[inline]
     fn clear_screen(&mut self, mode: ansi::ClearMode) {
-        trace!("Clearing screen: {:?}", mode);
+        trace!("Clearing screen: {mode:?}");
         let bg = self.grid.cursor.template.bg;
 
         let screen_lines = self.screen_lines();
@@ -1819,7 +1819,7 @@ impl<T: EventListener> Handler for Term<T> {
 
     #[inline]
     fn clear_tabs(&mut self, mode: ansi::TabulationClearMode) {
-        trace!("Clearing tabs: {:?}", mode);
+        trace!("Clearing tabs: {mode:?}");
         match mode {
             ansi::TabulationClearMode::Current => {
                 self.tabs[self.grid.cursor.point.column] = false;
@@ -1872,14 +1872,14 @@ impl<T: EventListener> Handler for Term<T> {
 
     #[inline]
     fn set_hyperlink(&mut self, hyperlink: Option<Hyperlink>) {
-        trace!("Setting hyperlink: {:?}", hyperlink);
+        trace!("Setting hyperlink: {hyperlink:?}");
         self.grid.cursor.template.set_hyperlink(hyperlink.map(|e| e.into()));
     }
 
     /// Set a terminal attribute.
     #[inline]
     fn terminal_attribute(&mut self, attr: Attr) {
-        trace!("Setting attribute: {:?}", attr);
+        trace!("Setting attribute: {attr:?}");
         let cursor = &mut self.grid.cursor;
         match attr {
             Attr::Foreground(color) => cursor.template.fg = color,
@@ -1925,7 +1925,7 @@ impl<T: EventListener> Handler for Term<T> {
             Attr::Strike => cursor.template.flags.insert(Flags::STRIKEOUT),
             Attr::CancelStrike => cursor.template.flags.remove(Flags::STRIKEOUT),
             _ => {
-                debug!("Term got unhandled attr: {:?}", attr);
+                debug!("Term got unhandled attr: {attr:?}");
             },
         }
     }
@@ -1935,12 +1935,12 @@ impl<T: EventListener> Handler for Term<T> {
         let mode = match mode {
             PrivateMode::Named(mode) => mode,
             PrivateMode::Unknown(mode) => {
-                debug!("Ignoring unknown mode {} in set_private_mode", mode);
+                debug!("Ignoring unknown mode {mode} in set_private_mode");
                 return;
             },
         };
 
-        trace!("Setting private mode: {:?}", mode);
+        trace!("Setting private mode: {mode:?}");
         match mode {
             NamedPrivateMode::UrgencyHints => self.mode.insert(TermMode::URGENCY_HINTS),
             NamedPrivateMode::SwapScreenAndSetRestoreCursor => {
@@ -1995,12 +1995,12 @@ impl<T: EventListener> Handler for Term<T> {
         let mode = match mode {
             PrivateMode::Named(mode) => mode,
             PrivateMode::Unknown(mode) => {
-                debug!("Ignoring unknown mode {} in unset_private_mode", mode);
+                debug!("Ignoring unknown mode {mode} in unset_private_mode");
                 return;
             },
         };
 
-        trace!("Unsetting private mode: {:?}", mode);
+        trace!("Unsetting private mode: {mode:?}");
         match mode {
             NamedPrivateMode::UrgencyHints => self.mode.remove(TermMode::URGENCY_HINTS),
             NamedPrivateMode::SwapScreenAndSetRestoreCursor => {
@@ -2096,12 +2096,12 @@ impl<T: EventListener> Handler for Term<T> {
         let mode = match mode {
             ansi::Mode::Named(mode) => mode,
             ansi::Mode::Unknown(mode) => {
-                debug!("Ignoring unknown mode {} in set_mode", mode);
+                debug!("Ignoring unknown mode {mode} in set_mode");
                 return;
             },
         };
 
-        trace!("Setting public mode: {:?}", mode);
+        trace!("Setting public mode: {mode:?}");
         match mode {
             NamedMode::Insert => self.mode.insert(TermMode::INSERT),
             NamedMode::LineFeedNewLine => self.mode.insert(TermMode::LINE_FEED_NEW_LINE),
@@ -2113,12 +2113,12 @@ impl<T: EventListener> Handler for Term<T> {
         let mode = match mode {
             ansi::Mode::Named(mode) => mode,
             ansi::Mode::Unknown(mode) => {
-                debug!("Ignoring unknown mode {} in unset_mode", mode);
+                debug!("Ignoring unknown mode {mode} in unset_mode");
                 return;
             },
         };
 
-        trace!("Setting public mode: {:?}", mode);
+        trace!("Setting public mode: {mode:?}");
         match mode {
             NamedMode::Insert => {
                 self.mode.remove(TermMode::INSERT);
@@ -2154,7 +2154,7 @@ impl<T: EventListener> Handler for Term<T> {
         let bottom = bottom.unwrap_or_else(|| self.screen_lines());
 
         if top >= bottom {
-            debug!("Invalid scrolling region: ({};{})", top, bottom);
+            debug!("Invalid scrolling region: ({top};{bottom})");
             return;
         }
 
@@ -2165,7 +2165,7 @@ impl<T: EventListener> Handler for Term<T> {
         let start = Line(top as i32 - 1);
         let end = Line(bottom as i32);
 
-        trace!("Setting scrolling region: ({};{})", start, end);
+        trace!("Setting scrolling region: ({start};{end})");
 
         let screen_lines = Line(self.screen_lines() as i32);
         self.scroll_region.start = cmp::min(start, screen_lines);
@@ -2187,19 +2187,19 @@ impl<T: EventListener> Handler for Term<T> {
 
     #[inline]
     fn configure_charset(&mut self, index: CharsetIndex, charset: StandardCharset) {
-        trace!("Configuring charset {:?} as {:?}", index, charset);
+        trace!("Configuring charset {index:?} as {charset:?}");
         self.grid.cursor.charsets[index] = charset;
     }
 
     #[inline]
     fn set_active_charset(&mut self, index: CharsetIndex) {
-        trace!("Setting active charset {:?}", index);
+        trace!("Setting active charset {index:?}");
         self.active_charset = index;
     }
 
     #[inline]
     fn set_cursor_style(&mut self, style: Option<CursorStyle>) {
-        trace!("Setting cursor style {:?}", style);
+        trace!("Setting cursor style {style:?}");
         self.cursor_style = style;
 
         // Notify UI about blinking changes.
@@ -2208,7 +2208,7 @@ impl<T: EventListener> Handler for Term<T> {
 
     #[inline]
     fn set_cursor_shape(&mut self, shape: CursorShape) {
-        trace!("Setting cursor shape {:?}", shape);
+        trace!("Setting cursor shape {shape:?}");
 
         let style = self.cursor_style.get_or_insert(self.config.default_cursor_style);
         style.shape = shape;
@@ -2216,7 +2216,7 @@ impl<T: EventListener> Handler for Term<T> {
 
     #[inline]
     fn set_title(&mut self, title: Option<String>) {
-        trace!("Setting title to '{:?}'", title);
+        trace!("Setting title to '{title:?}'");
 
         self.title.clone_from(&title);
 
@@ -2235,8 +2235,7 @@ impl<T: EventListener> Handler for Term<T> {
         if self.title_stack.len() >= TITLE_STACK_MAX_DEPTH {
             let removed = self.title_stack.remove(0);
             trace!(
-                "Removing '{:?}' from bottom of title stack that exceeds its maximum depth",
-                removed
+                "Removing '{removed:?}' from bottom of title stack that exceeds its maximum depth"
             );
         }
 
@@ -2248,7 +2247,7 @@ impl<T: EventListener> Handler for Term<T> {
         trace!("Attempting to pop title from stack...");
 
         if let Some(popped) = self.title_stack.pop() {
-            trace!("Title '{:?}' popped from stack", popped);
+            trace!("Title '{popped:?}' popped from stack");
             self.set_title(popped);
         }
     }
diff --git a/alacritty_terminal/src/tty/unix.rs b/alacritty_terminal/src/tty/unix.rs
index bbddfca6..a78e143d 100644
--- a/alacritty_terminal/src/tty/unix.rs
+++ b/alacritty_terminal/src/tty/unix.rs
@@ -383,7 +383,7 @@ impl EventedPty for Pty {
         let mut buf = [0u8; 1];
         if let Err(err) = self.signals.read(&mut buf) {
             if err.kind() != ErrorKind::WouldBlock {
-                error!("Error reading from signal pipe: {}", err);
+                error!("Error reading from signal pipe: {err}");
             }
             return None;
         }
@@ -391,7 +391,7 @@ impl EventedPty for Pty {
         // Match on the child process.
         match self.child.try_wait() {
             Err(err) => {
-                error!("Error checking child process termination: {}", err);
+                error!("Error checking child process termination: {err}");
                 None
             },
             Ok(None) => None,