-D rust clippy very fucking pretty

Author: unitdevgcc

crates/tui/src/app.rs

@@ -240,7 +240,6 @@ impl App {
     fn render_frame(&mut self, f: &mut Frame, theme: &Theme) {
         let area = f.area();
 
-        if self.sftp_session_id.is_some() && matches!(self.mode, AppMode::Sftp) {}
         if let Some(idx) = self.active_session {
             if let Some(s) = self.sessions.get(idx) {
                 if matches!(s.status, SessionStatus::Active | SessionStatus::Connecting)
@@ -465,7 +464,7 @@ impl App {
                 if pos < line_str.len() {
                     spans.push(Span::raw(line_str[pos..].to_string()));
                 }
-                lines[li as usize] = Line::from(spans);
+                lines[li] = Line::from(spans);
             }
         }
         let (cursor_col, cursor_row) = self.sessions[idx].view.cursor();
@@ -1482,22 +1481,22 @@ impl App {
             return;
         }
 
-        if !self.sessions.is_empty() && !matches!(self.mode, AppMode::Prompt { .. }) {
-            if k.code == KeyCode::Tab
-                && !k.modifiers.contains(KeyModifiers::CONTROL)
-                && !self.capture_mode
-            {
-                self.focus = Focus::Terminal;
+        if !self.sessions.is_empty()
+            && !matches!(self.mode, AppMode::Prompt { .. })
+            && k.code == KeyCode::Tab
+            && !k.modifiers.contains(KeyModifiers::CONTROL)
+            && !self.capture_mode
+        {
+            self.focus = Focus::Terminal;
 
-                let first = self
-                    .sessions
-                    .iter()
-                    .position(|s| s.is_active() || s.disconnected().is_some())
-                    .or(self.active_session);
-                if let Some(i) = first {
-                    self.active_session = Some(i);
-                    return;
-                }
+            let first = self
+                .sessions
+                .iter()
+                .position(|s| s.is_active() || s.disconnected().is_some())
+                .or(self.active_session);
+            if let Some(i) = first {
+                self.active_session = Some(i);
+                return;
             }
         }
 
@@ -1883,7 +1882,7 @@ impl App {
             }
             (KeyCode::Enter, _) => {
                 if let Some(h) = self.selected_host().cloned() {
-                    let _ = cmd_tx.send(Cmd::Connect { host: h });
+                    let _ = cmd_tx.send(Cmd::Connect { host: Box::new(h) });
                 }
             }
             (KeyCode::F(2), _) => {
@@ -3891,7 +3890,7 @@ fn format_network_speed(kbs: f32) -> String {
     } else if kbs >= 1.0 {
         format!("{:.0}KB/s", kbs)
     } else {
-        format!("0B/s")
+        "0B/s".to_string()
     }
 }
 
@@ -4303,7 +4302,7 @@ fn key_to_bytes(k: KeyEvent) -> Vec<u8> {
 
 #[derive(Debug)]
 pub enum Cmd {
-    Connect { host: Host },
+    Connect { host: Box<Host> },
     CancelConnect,
     OpenSftp { session_id: SessionId },
     SftpEnter,

crates/tui/src/pty_render.rs

@@ -50,7 +50,7 @@ impl TerminalView {
 
     pub fn cursor(&self) -> (u16, u16) {
         let (r, c) = self.parser.screen().cursor_position();
-        (c as u16, r as u16)
+        (c, r)
     }
 
     pub fn scroll_up(&mut self, n: u16) {
@@ -101,7 +101,7 @@ impl TerminalView {
         let mut out = Vec::with_capacity(self.rows as usize);
         for y in want_from..want_to.min(total) {
             let mut s = String::new();
-            for x in 0..self.cols as u16 {
+            for x in 0..self.cols {
                 if let Some(cell) = screen.cell(y as u16, x) {
                     s.push(cell.contents().chars().next().unwrap_or(' '));
                 } else {

crates/tui/src/settings.rs

@@ -511,7 +511,7 @@ pub fn draw_settings(
             let phase = animation_phase(3000);
             let nick_color = cycle_color(theme.accent2, theme.accent, theme.good, phase);
 
-            let raw_lines = vec![
+            let raw_lines = [
                 format!("Made with {} by project-fe.dev", '\u{2665}'),
                 "Main developer: c0redev".into(),
                 "Website: unitdev.run".into(),
@@ -606,7 +606,7 @@ pub fn draw_settings(
             let val = if editing {
                 format!(" {}_", s.edit_buf)
             } else {
-                format!("{}", f.value)
+                f.value.to_string()
             };
 
             let val_color = if editing {

crates/tui/src/state.rs

@@ -80,6 +80,12 @@ pub struct SearchState {
     pub active: bool,
 }
 
+impl Default for SearchState {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl SearchState {
     pub fn new() -> Self {
         Self {

crates/tui/src/view.rs

@@ -10,6 +10,7 @@ use ratatui::widgets::{
 use ratatui::Frame;
 use std::collections::{HashMap, HashSet};
 
+#[allow(clippy::too_many_arguments)]
 pub fn draw_host_list(
     f: &mut Frame,
     area: Rect,
@@ -145,6 +146,7 @@ pub fn draw_host_list(
     f.render_stateful_widget(list, area, state);
 }
 
+#[allow(clippy::too_many_arguments)]
 pub fn draw_terminal(
     f: &mut Frame,
     area: Rect,