Merge pull request #149 from academician/lint-fixes

Fix various lints

Author: itsjunetime

Cargo.toml

@@ -26,7 +26,6 @@ thiserror = "^1"
 regex = { version = "^1", optional = true }
 crossbeam-channel = "^0.5"
 parking_lot = "0.12.1"
-once_cell = { version = "^1.18", features = ["parking_lot"] }
 
 [features]
 search = [ "regex" ]

Justfile

@@ -1,7 +1,7 @@
 _prechecks:
   -cargo hack 2> /dev/null
-
-  if [ $? == 101 ]; then \
+  
+  if [ $? -eq 101 ]; then \
     cargo install cargo-hack; \
   fi
 
@@ -25,7 +25,7 @@ examples:
  cargo check --example=less-rs --features=dynamic_output,search
 
 lint: _prechecks
-  cargo hack --feature-powerset clippy
+  cargo hack --feature-powerset clippy --all-targets
 
 verify-all: check-fmt build tests examples lint
  @echo "Ready to go"

README.md

@@ -125,7 +125,6 @@ And the help from these projects:-
 - [regex](https://crates.io/crates/regex): Regex support when searching.
 - [crossbeam-channel](https://crates.io/crates/crossbeam-channel): MPMC channel
 - [parking_lot](https://crates.io/crates/parking_lot): Improved atomic storage types
-- [once_cell](https://crates.io/crates/once_cell): Provides one-time initialization types.
 - [tokio](https://crates.io/crates/tokio): Provides runtime for async examples.
 
 ## Get in touch

examples/large_lines.rs

@@ -5,7 +5,7 @@ fn main() -> Result<(), MinusError> {
 
     for i in 0..30 {
         for _ in 0..=10 {
-            output.push_str(&format!("{}. Hello ", i))?;
+            output.push_str(format!("{}. Hello ", i))?;
         }
         output.push_str("\n")?;
     }

examples/msg-tokio.rs

@@ -8,7 +8,7 @@ async fn main() -> Result<(), MinusError> {
 
     let increment = async {
         for i in 0..=10_u32 {
-            output.push_str(&format!("{}\n", i))?;
+            output.push_str(format!("{}\n", i))?;
             sleep(Duration::from_millis(100)).await;
         }
         output.send_message("No more output to come")?;

examples/static.rs

@@ -4,7 +4,7 @@ fn main() -> Result<(), MinusError> {
     let output = minus::Pager::new();
 
     for i in 0..=100 {
-        output.push_str(&format!("{}\n", i))?;
+        output.push_str(format!("{}\n", i))?;
     }
 
     minus::page_all(output)?;

src/core/commands.rs

@@ -72,13 +72,13 @@ impl PartialEq for Command {
 impl Debug for Command {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Self::SetData(text) => write!(f, "SetData({:?})", text),
-            Self::AppendData(text) => write!(f, "AppendData({:?})", text),
-            Self::SetPrompt(text) => write!(f, "SetPrompt({:?})", text),
-            Self::SendMessage(text) => write!(f, "SendMessage({:?})", text),
-            Self::SetLineNumbers(ln) => write!(f, "SetLineNumbers({:?})", ln),
-            Self::LineWrapping(lw) => write!(f, "LineWrapping({:?})", lw),
-            Self::SetExitStrategy(es) => write!(f, "SetExitStrategy({:?})", es),
+            Self::SetData(text) => write!(f, "SetData({text:?})"),
+            Self::AppendData(text) => write!(f, "AppendData({text:?})"),
+            Self::SetPrompt(text) => write!(f, "SetPrompt({text:?})"),
+            Self::SendMessage(text) => write!(f, "SendMessage({text:?})"),
+            Self::SetLineNumbers(ln) => write!(f, "SetLineNumbers({ln:?})"),
+            Self::LineWrapping(lw) => write!(f, "LineWrapping({lw:?})"),
+            Self::SetExitStrategy(es) => write!(f, "SetExitStrategy({es:?})"),
             Self::SetInputClassifier(_) => write!(f, "SetInputClassifier"),
             Self::ShowPrompt(show) => write!(f, "ShowPrompt({show:?})"),
             Self::FormatRedrawPrompt => write!(f, "FormatRedrawPrompt"),

src/core/ev_handler.rs

@@ -287,9 +287,9 @@ pub fn handle_event(
 
         Command::SetPrompt(ref text) | Command::SendMessage(ref text) => {
             if let Command::SetPrompt(_) = ev {
-                p.prompt = text.to_string();
+                p.prompt = text.clone();
             } else {
-                p.message = Some(text.to_string());
+                p.message = Some(text.clone());
             }
             p.format_prompt();
             if !p.running.lock().is_uninitialized() {
@@ -337,17 +337,16 @@ mod tests {
     use super::super::commands::Command;
     use super::handle_event;
     use crate::{minus_core::CommandQueue, ExitStrategy, PagerState, RunMode};
-    use std::sync::{atomic::AtomicBool, Arc};
     #[cfg(feature = "search")]
-    use {
-        once_cell::sync::Lazy,
-        parking_lot::{Condvar, Mutex},
-    };
+    use parking_lot::{Condvar, Mutex};
+    #[cfg(feature = "search")]
+    use std::sync::LazyLock;
+    use std::sync::{atomic::AtomicBool, Arc};
 
     // Tests constants
     #[cfg(feature = "search")]
-    static UIA: Lazy<Arc<(Mutex<bool>, Condvar)>> =
-        Lazy::new(|| Arc::new((Mutex::new(true), Condvar::new())));
+    static UIA: LazyLock<Arc<(Mutex<bool>, Condvar)>> =
+        LazyLock::new(|| Arc::new((Mutex::new(true), Condvar::new())));
     const TEST_STR: &str = "This is some sample text";
 
     // Tests for event emitting functions of Pager

src/core/init.rs

@@ -2,12 +2,12 @@
 //!
 //! This module provides two main functions:-
 //! * The [`init_core`] function which is responsible for setting the initial state of the
-//! Pager, do environment checks and initializing various core functions on either async
-//! tasks or native threads depending on the feature set
+//!   Pager, do environment checks and initializing various core functions on either async
+//!   tasks or native threads depending on the feature set
 //!
 //! * The [`start_reactor`] function displays the displays the output and also polls
-//! the [`Receiver`] held inside the [`Pager`] for events. Whenever a event is
-//! detected, it reacts to it accordingly.
+//!   the [`Receiver`] held inside the [`Pager`] for events. Whenever a event is
+//!   detected, it reacts to it accordingly.
 #[cfg(feature = "static_output")]
 use crate::minus_core::utils::display;
 use crate::{
@@ -52,21 +52,21 @@ use super::{utils::display::draw_for_change, CommandQueue, RUNMODE};
 ///
 /// Then it checks if the minus is running in static mode and does some checks:-
 /// * If standard output is not a terminal screen, that is if it is a file or block
-/// device, minus will write all the data at once to the stdout and quit
+///   device, minus will write all the data at once to the stdout and quit
 ///
 /// * If the size of the data is less than the available number of rows in the terminal
-/// then it displays everything on the main stdout screen at once and quits. This
-/// behaviour can be turned off if [`Pager::set_run_no_overflow(true)`] is called
-/// by the main application
+///   then it displays everything on the main stdout screen at once and quits. This
+///   behaviour can be turned off if [`Pager::set_run_no_overflow(true)`] is called
+///   by the main application
 // Sorry... this behaviour would have been cool to have in async mode, just think about it!!! Many
 // implementations were proposed but none were perfect
 // It is because implementing this especially with line wrapping and terminal scrolling
 // is a a nightmare because terminals are really naughty and more when you have to fight with it
 // using your library... your only weapon
 // So we just don't take any more proposals about this. It is really frustating to
 // to thoroughly test each implementation and fix out all rough edges around it
-/// Next it initializes the runtime and calls [`start_reactor`] and a [`event reader`]` which is
-/// selected based on the enabled feature set:-
+///   Next it initializes the runtime and calls [`start_reactor`] and a [`event reader`]` which is
+///   selected based on the enabled feature set:-
 ///
 /// # Errors
 ///

src/core/utils/display/mod.rs

@@ -207,7 +207,7 @@ pub fn draw_append_text(
             crossterm::execute!(out, crossterm::terminal::Clear(ClearType::CurrentLine))?;
         }
         for line in &fmt_text[0..num_appendable] {
-            write!(out, "{}\n\r", line)?;
+            write!(out, "{line}\n\r")?;
         }
         out.flush()?;
     }