Fix some warnings

Author: pvolok

src/Cargo.toml

@@ -93,4 +93,8 @@ winapi = { version = "0.3", features = ["consoleapi", "winuser"] }
 [lints.clippy]
 collapsible_else_if = "allow"
 collapsible_if = "allow"
+module_inception = "allow"
+redundant_closure = "allow"
+single_match = "allow"
+upper_case_acronyms = "allow"
 while_let_loop = "allow"

src/kernel/proc.rs

@@ -1,4 +1,4 @@
-use std::collections::{HashMap, HashSet};
+use std::collections::HashMap;
 
 use serde::{Deserialize, Serialize};
 use tokio::sync::mpsc::UnboundedSender;

src/modal/add_proc.rs

@@ -64,7 +64,7 @@ impl Modal for AddProcModal {
       _ => (),
     }
 
-    let req = tui_input::backend::crossterm::to_input_request(&event);
+    let req = tui_input::backend::crossterm::to_input_request(event);
     if let Some(req) = req {
       self.input.handle(req);
       loop_action.render();
@@ -107,6 +107,6 @@ impl Modal for AddProcModal {
       &mut cursor,
     );
 
-    frame.set_cursor(cursor.0, cursor.1);
+    frame.set_cursor_position((cursor.0, cursor.1));
   }
 }

src/modal/rename_proc.rs

@@ -106,6 +106,6 @@ impl Modal for RenameProcModal {
       &mut cursor,
     );
 
-    frame.set_cursor(cursor.0, cursor.1);
+    frame.set_cursor_position((cursor.0, cursor.1));
   }
 }

src/proc/mod.rs

@@ -13,7 +13,6 @@ use tui::layout::Rect;
 
 use crate::kernel::proc::ProcId;
 use crate::key::Key;
-use crate::mouse::MouseEvent;
 use crate::vt100::TermReplySender;
 use crate::yaml_val::Val;
 
@@ -53,13 +52,6 @@ impl StopSignal {
   }
 }
 
-fn translate_mouse_pos(event: &MouseEvent, scrollback: usize) -> Pos {
-  Pos {
-    y: event.y - scrollback as i32,
-    x: event.x,
-  }
-}
-
 #[derive(Clone)]
 pub struct Size {
   width: u16,
@@ -97,12 +89,11 @@ pub struct Pos {
 
 impl Pos {
   pub fn to_low_high<'a>(a: &'a Self, b: &'a Self) -> (&'a Self, &'a Self) {
-    if a.y > b.y {
-      return (b, a);
-    } else if a.y == b.y && a.x > b.x {
-      return (b, a);
+    if a.y < b.y || a.y == b.y && a.x < b.x {
+      (a, b)
+    } else {
+      (b, a)
     }
-    (a, b)
   }
 
   pub fn within(start: &Self, end: &Self, target: &Self) -> bool {
@@ -111,13 +102,7 @@ impl Pos {
     let (low, high) = Pos::to_low_high(start, end);
 
     if y > low.y {
-      if y < high.y {
-        true
-      } else if y == high.y && x <= high.x {
-        true
-      } else {
-        false
-      }
+      y < high.y || y == high.y && x <= high.x
     } else if y == low.y {
       if y < high.y {
         x >= low.x

src/proc/msg.rs

@@ -3,10 +3,7 @@ use std::{any::Any, fmt::Debug};
 use compact_str::CompactString;
 
 use crate::{
-  kernel::{
-    kernel_message::SharedVt,
-    proc::{ProcId, ProcStatus},
-  },
+  kernel::{kernel_message::SharedVt, proc::ProcId},
   key::Key,
   mouse::MouseEvent,
 };

src/proc/view.rs

@@ -62,7 +62,7 @@ impl ProcView {
     self.exit_code
   }
 
-  pub fn lock_view(&self) -> ProcViewFrame {
+  pub fn lock_view(&'_ self) -> ProcViewFrame<'_> {
     match &self.vt {
       None => ProcViewFrame::Empty,
       Some(vt) => vt

src/yaml_val.rs

@@ -5,17 +5,18 @@ use indexmap::IndexMap;
 use serde_yaml::Value;
 
 #[derive(Clone)]
-struct Trace(Option<Rc<Box<(String, Trace)>>>);
+struct Trace(Option<Rc<(String, Trace)>>);
 
 impl Trace {
   pub fn empty() -> Self {
     Trace(None)
   }
 
   pub fn add<T: ToString>(&self, seg: T) -> Self {
-    Trace(Some(Rc::new(Box::new((seg.to_string(), self.clone())))))
+    Trace(Some(Rc::new((seg.to_string(), self.clone()))))
   }
 
+  #[allow(clippy::inherent_to_string)]
   pub fn to_string(&self) -> String {
     let mut str = String::new();
     fn add(buf: &mut String, trace: &Trace) {
@@ -44,11 +45,7 @@ impl<'a> Val<'a> {
   fn create(value: &'a Value, trace: Trace) -> anyhow::Result<Self> {
     match value {
       Value::Mapping(map) => {
-        if map
-          .into_iter()
-          .next()
-          .map_or(false, |(k, _)| k.eq("$select"))
-        {
+        if map.into_iter().next().is_some_and(|(k, _)| k.eq("$select")) {
           let (v, t) = Self::select(map, trace.clone())?;
           return Self::create(v, t);
         }
@@ -66,12 +63,12 @@ impl<'a> Val<'a> {
     map: &'a serde_yaml::Mapping,
     trace: Trace,
   ) -> anyhow::Result<(&'a Value, Trace)> {
-    if map.get(&Value::from("$select")).unwrap() == "os" {
-      if let Some(v) = map.get(&Value::from(OS)) {
+    if map.get(Value::from("$select")).unwrap() == "os" {
+      if let Some(v) = map.get(Value::from(OS)) {
         return Ok((v, trace.add(OS)));
       }
 
-      if let Some(v) = map.get(&Value::from("$else")) {
+      if let Some(v) = map.get(Value::from("$else")) {
         return Ok((v, trace.add("$else")));
       }
 
@@ -110,7 +107,7 @@ impl<'a> Val<'a> {
     })
   }
 
-  pub fn as_array(&self) -> anyhow::Result<Vec<Val>> {
+  pub fn as_array(&'_ self) -> anyhow::Result<Vec<Val<'_>>> {
     self
       .0
       .as_sequence()
@@ -123,7 +120,7 @@ impl<'a> Val<'a> {
       .collect::<anyhow::Result<Vec<_>>>()
   }
 
-  pub fn as_object(&self) -> anyhow::Result<IndexMap<Value, Val>> {
+  pub fn as_object(&'_ self) -> anyhow::Result<IndexMap<Value, Val<'_>>> {
     self
       .0
       .as_mapping()
@@ -138,7 +135,7 @@ impl<'a> Val<'a> {
           item: &'a Value,
           trace: &'a Trace,
         ) -> anyhow::Result<Val<'a>> {
-          Ok(Val::create(item, trace.add(value_to_string(k)?))?)
+          Val::create(item, trace.add(value_to_string(k)?))
         }
         Ok((k.to_owned(), mk_val(k, item, &self.1)?))
       })