Merge pull request #151 from itsjunetime/june/update_to_2024

Update to edition 2024

Author: itsjunetime

Cargo.toml

@@ -2,7 +2,7 @@
 name = "minus"
 version = "5.6.1"
 authors = ["Arijit Dey <[email protected]>"]
-edition = "2018"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 documentation = "https://docs.rs/minus"
 repository = "https://github.com/AMythicDev/minus"

examples/color-output.rs

@@ -1,5 +1,5 @@
 use crossterm::style::{Color, ResetColor, SetForegroundColor};
-use minus::{error::MinusError, page_all, Pager};
+use minus::{Pager, error::MinusError, page_all};
 use std::fmt::Write;
 
 fn main() -> Result<(), MinusError> {

examples/static-no-overflow.rs

@@ -1,5 +1,5 @@
 use minus::error::MinusError;
-use minus::{page_all, Pager};
+use minus::{Pager, page_all};
 use std::fmt::Write;
 
 fn main() -> Result<(), MinusError> {

src/core/commands.rs

@@ -6,8 +6,8 @@
 use std::fmt::Debug;
 
 use crate::{
-    input::{InputClassifier, InputEvent},
     ExitStrategy, LineNumbers,
+    input::{InputClassifier, InputEvent},
 };
 
 #[cfg(feature = "search")]

src/core/ev_handler.rs

@@ -2,17 +2,17 @@
 
 use std::convert::TryInto;
 use std::io::Write;
-use std::sync::{atomic::AtomicBool, Arc};
+use std::sync::{Arc, atomic::AtomicBool};
 
 #[cfg(feature = "search")]
 use parking_lot::{Condvar, Mutex};
 
-use super::utils::display::{self, AppendStyle};
 use super::CommandQueue;
+use super::utils::display::{self, AppendStyle};
 use super::{commands::Command, utils::term};
 #[cfg(feature = "search")]
 use crate::search;
-use crate::{error::MinusError, input::InputEvent, PagerState};
+use crate::{PagerState, error::MinusError, input::InputEvent};
 
 /// Respond based on the type of command
 ///
@@ -336,12 +336,12 @@ pub fn handle_event(
 mod tests {
     use super::super::commands::Command;
     use super::handle_event;
-    use crate::{minus_core::CommandQueue, ExitStrategy, PagerState, RunMode};
+    use crate::{ExitStrategy, PagerState, RunMode, minus_core::CommandQueue};
     #[cfg(feature = "search")]
     use parking_lot::{Condvar, Mutex};
     #[cfg(feature = "search")]
     use std::sync::LazyLock;
-    use std::sync::{atomic::AtomicBool, Arc};
+    use std::sync::{Arc, atomic::AtomicBool};
 
     // Tests constants
     #[cfg(feature = "search")]

src/core/init.rs

@@ -11,25 +11,25 @@
 #[cfg(feature = "static_output")]
 use crate::minus_core::utils::display;
 use crate::{
+    Pager, PagerState,
     error::MinusError,
     input::InputEvent,
     minus_core::{
+        RunMode,
         commands::Command,
         ev_handler::handle_event,
         utils::{display::draw_full, term},
-        RunMode,
     },
-    Pager, PagerState,
 };
 
 use crossbeam_channel::{Receiver, Sender, TrySendError};
 use crossterm::event;
 use std::{
-    io::{stdout, Stdout},
+    io::{Stdout, stdout},
     panic,
     sync::{
-        atomic::{AtomicBool, Ordering},
         Arc,
+        atomic::{AtomicBool, Ordering},
     },
 };
 
@@ -40,7 +40,7 @@ use {super::utils::display::write_raw_lines, crossterm::tty::IsTty};
 use parking_lot::Condvar;
 use parking_lot::Mutex;
 
-use super::{utils::display::draw_for_change, CommandQueue, RUNMODE};
+use super::{CommandQueue, RUNMODE, utils::display::draw_for_change};
 
 /// The main entry point of minus
 ///
@@ -88,7 +88,10 @@ pub fn init_core(pager: &Pager, rm: RunMode) -> std::result::Result<(), MinusErr
 
     {
         let mut runmode = super::RUNMODE.lock();
-        assert!(runmode.is_uninitialized(), "Failed to set the RUNMODE. This is caused probably because another instance of minus is already running");
+        assert!(
+            runmode.is_uninitialized(),
+            "Failed to set the RUNMODE. This is caused probably because another instance of minus is already running"
+        );
         *runmode = rm;
         drop(runmode);
     }

src/core/mod.rs

@@ -45,7 +45,10 @@ impl CommandQueue {
     /// This function will panic if it is called in an environment where [RUNMODE] is
     /// uninitialized.
     pub fn push_back(&mut self, value: Command) {
-        assert!(!RUNMODE.lock().is_uninitialized(), "CommandQueue::push_back() caled when  RUNMODE is not set. This is most likely a bug. Please report the issue on minus's issue tracker on Github.");
+        assert!(
+            !RUNMODE.lock().is_uninitialized(),
+            "CommandQueue::push_back() caled when  RUNMODE is not set. This is most likely a bug. Please report the issue on minus's issue tracker on Github."
+        );
         self.0.push_back(value);
     }
     /// Store `value` without checking [RUNMODE].

src/core/utils/display/mod.rs

@@ -10,7 +10,7 @@ use std::{cmp::Ordering, convert::TryInto, io::Write};
 
 use super::term;
 use crate::screen::Row;
-use crate::{error::MinusError, minus_core, LineNumbers, PagerState};
+use crate::{LineNumbers, PagerState, error::MinusError, minus_core};
 
 /// How should the incoming text be drawn on the screen
 #[derive(Debug, PartialEq, Eq)]

src/core/utils/display/tests.rs

@@ -233,9 +233,11 @@ fn draw_short_no_line_numbers() {
 
     assert!(draw_full(&mut out, &mut pager).is_ok());
 
-    assert!(String::from_utf8(out)
-        .expect("Should have written valid UTF-8")
-        .contains("\rA line\n\rAnother line"));
+    assert!(
+        String::from_utf8(out)
+            .expect("Should have written valid UTF-8")
+            .contains("\rA line\n\rAnother line")
+    );
     assert_eq!(pager.upper_mark, 0);
 
     let mut out = Vec::with_capacity(lines.len());
@@ -245,9 +247,11 @@ fn draw_short_no_line_numbers() {
 
     // The number of lines is less than 'rows' so 'upper_mark' will be 0 even
     // if we set it to 1. This is done because everything can be displayed without problems.
-    assert!(String::from_utf8(out)
-        .expect("Should have written valid UTF-8")
-        .contains("\rA line\n\rAnother line"));
+    assert!(
+        String::from_utf8(out)
+            .expect("Should have written valid UTF-8")
+            .contains("\rA line\n\rAnother line")
+    );
     assert_eq!(pager.upper_mark, 0);
 }
 
@@ -264,9 +268,11 @@ fn draw_long_no_line_numbers() {
 
     assert!(draw_full(&mut out, &mut pager).is_ok());
 
-    assert!(String::from_utf8(out)
-        .expect("Should have written valid UTF-8")
-        .contains("\rA line\n\rAnother line"));
+    assert!(
+        String::from_utf8(out)
+            .expect("Should have written valid UTF-8")
+            .contains("\rA line\n\rAnother line")
+    );
     assert_eq!(pager.upper_mark, 0);
 
     // This ensures that asking for a position other than 0 works.
@@ -275,9 +281,11 @@ fn draw_long_no_line_numbers() {
 
     assert!(draw_full(&mut out, &mut pager).is_ok());
 
-    assert!(String::from_utf8(out)
-        .expect("Should have written valid UTF-8")
-        .contains("\rAnother line\n\rThird line"));
+    assert!(
+        String::from_utf8(out)
+            .expect("Should have written valid UTF-8")
+            .contains("\rAnother line\n\rThird line")
+    );
     assert_eq!(pager.upper_mark, 1);
 
     // This test ensures that as much text as possible will be displayed, even
@@ -287,9 +295,11 @@ fn draw_long_no_line_numbers() {
 
     assert!(draw_full(&mut out, &mut pager).is_ok());
 
-    assert!(String::from_utf8(out)
-        .expect("Should have written valid UTF-8")
-        .contains("\rThird line\n\rFourth line"));
+    assert!(
+        String::from_utf8(out)
+            .expect("Should have written valid UTF-8")
+            .contains("\rThird line\n\rFourth line")
+    );
     assert_eq!(pager.upper_mark, 2);
 }
 
@@ -303,9 +313,11 @@ fn draw_short_with_line_numbers() {
     pager.format_lines();
 
     assert!(draw_full(&mut out, &mut pager).is_ok());
-    assert!(String::from_utf8(out)
-        .expect("Should have written valid UTF-8")
-        .contains("\r     1. A line\n\r     2. Another line"));
+    assert!(
+        String::from_utf8(out)
+            .expect("Should have written valid UTF-8")
+            .contains("\r     1. A line\n\r     2. Another line")
+    );
     assert_eq!(pager.upper_mark, 0);
 
     let mut out = Vec::with_capacity(lines.len());
@@ -315,9 +327,11 @@ fn draw_short_with_line_numbers() {
 
     // The number of lines is less than 'rows' so 'upper_mark' will be 0 even
     // if we set it to 1. This is done because everything can be displayed without problems.
-    assert!(String::from_utf8(out)
-        .expect("Should have written valid UTF-8")
-        .contains("\r     1. A line\n\r     2. Another line"));
+    assert!(
+        String::from_utf8(out)
+            .expect("Should have written valid UTF-8")
+            .contains("\r     1. A line\n\r     2. Another line")
+    );
     assert_eq!(pager.upper_mark, 0);
 }
 
@@ -335,9 +349,11 @@ fn draw_long_with_line_numbers() {
 
     assert!(draw_full(&mut out, &mut pager).is_ok());
 
-    assert!(String::from_utf8(out)
-        .expect("Should have written valid UTF-8")
-        .contains("\r     1. A line\n\r     2. Another line"));
+    assert!(
+        String::from_utf8(out)
+            .expect("Should have written valid UTF-8")
+            .contains("\r     1. A line\n\r     2. Another line")
+    );
     assert_eq!(pager.upper_mark, 0);
 
     // This ensures that asking for a position other than 0 works.
@@ -346,9 +362,11 @@ fn draw_long_with_line_numbers() {
 
     assert!(draw_full(&mut out, &mut pager).is_ok());
 
-    assert!(String::from_utf8(out)
-        .expect("Should have written valid UTF-8")
-        .contains("\r     2. Another line\n\r     3. Third line"));
+    assert!(
+        String::from_utf8(out)
+            .expect("Should have written valid UTF-8")
+            .contains("\r     2. Another line\n\r     3. Third line")
+    );
     assert_eq!(pager.upper_mark, 1);
 
     // This test ensures that as much text as possible will be displayed, even
@@ -358,9 +376,11 @@ fn draw_long_with_line_numbers() {
 
     assert!(draw_full(&mut out, &mut pager).is_ok());
 
-    assert!(String::from_utf8(out)
-        .expect("Should have written valid UTF-8")
-        .contains("\r     3. Third line\n\r     4. Fourth line"));
+    assert!(
+        String::from_utf8(out)
+            .expect("Should have written valid UTF-8")
+            .contains("\r     3. Third line\n\r     4. Fourth line")
+    );
     assert_eq!(pager.upper_mark, 2);
 }
 
@@ -439,9 +459,11 @@ fn test_draw_no_overflow() {
     pager.screen.orig_text = TEXT.to_string();
     pager.format_lines();
     draw_full(&mut out, &mut pager).unwrap();
-    assert!(String::from_utf8(out)
-        .expect("Should have written valid UTF-8")
-        .contains(TEXT));
+    assert!(
+        String::from_utf8(out)
+            .expect("Should have written valid UTF-8")
+            .contains(TEXT)
+    );
 }
 
 #[cfg(test)]

src/dynamic_pager.rs

@@ -1,6 +1,6 @@
+use crate::Pager;
 use crate::error::MinusError;
 use crate::minus_core::init;
-use crate::Pager;
 
 /// Starts a asynchronously running pager
 ///