Merge pull request #298 from Byron/updates

remove rust-version in favor of just the edition

Author: Byron

Cargo.lock

@@ -2,7 +2,7 @@
 name = "dua-cli"
 version = "2.32.2"
 authors = ["Sebastian Thiel <[email protected]>"]
-edition = "2021"
+edition = "2024"
 repository = "https://github.com/Byron/dua-cli"
 readme = "README.md"
 description = "A tool to conveniently learn about the disk usage of directories, fast!"
@@ -15,7 +15,6 @@ include = [
     "CHANGELOG.md",
     "!**/tests/*",
 ]
-rust-version = "1.83.0"
 
 [features]
 default = ["tui-crossplatform", "trash-move"]
@@ -35,8 +34,8 @@ clap_complete = "4.5.54"
 jwalk = "0.8.1"
 byte-unit = "4"
 atty = "0.2.11"
-petgraph = "0.7"
-itertools = "0.13.0"
+petgraph = "0.8.3"
+itertools = "0.14.0"
 num_cpus = "1.10.0"
 filesize = "0.2.0"
 anyhow = "1.0.31"
@@ -56,7 +55,7 @@ wild = "2.0.4"
 owo-colors = "4.0.0"
 human_format = "1.0.3"
 once_cell = "1.19"
-gix-glob = "0.17.0"
+gix-glob = "0.22.1"
 gix-path = "0.10.10"
 bstr = "1.8.0"
 simplelog = "0.12.1"

Cargo.toml

@@ -1,4 +1,4 @@
-use crate::{crossdev, ByteFormat, InodeFilter, Throttle, WalkOptions, WalkResult};
+use crate::{ByteFormat, InodeFilter, Throttle, WalkOptions, WalkResult, crossdev};
 use anyhow::Result;
 use filesize::PathExt;
 use owo_colors::{AnsiColors as Color, OwoColorize};

src/aggregate.rs

@@ -1,10 +1,10 @@
 use crate::crossdev;
 use crate::traverse::{EntryData, Tree, TreeIndex};
-use byte_unit::{n_gb_bytes, n_gib_bytes, n_mb_bytes, n_mib_bytes, ByteUnit};
+use byte_unit::{ByteUnit, n_gb_bytes, n_gib_bytes, n_mb_bytes, n_mib_bytes};
 use std::collections::BTreeSet;
 use std::path::PathBuf;
-use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::time::Duration;
 use std::{fmt, path::Path};
 
@@ -74,8 +74,8 @@ pub struct ByteFormatDisplay {
 
 impl fmt::Display for ByteFormatDisplay {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        use byte_unit::Byte;
         use ByteFormat::*;
+        use byte_unit::Byte;
 
         let format = match self.format {
             Bytes => return write!(f, "{} b", self.bytes),

src/common.rs

@@ -1,20 +1,20 @@
 use crate::interactive::state::FilesystemScan;
 use crate::interactive::{
+    CursorDirection, CursorMode, DisplayOptions, EntryCheck, MarkEntryMode,
     app::navigation::Navigation,
     state::FocussedPane,
-    widgets::{glob_search, MainWindow, MainWindowProps},
-    CursorDirection, CursorMode, DisplayOptions, EntryCheck, MarkEntryMode,
+    widgets::{MainWindow, MainWindowProps, glob_search},
 };
 use anyhow::Result;
 use crossbeam::channel::Receiver;
 use crosstermion::crossterm::event::{KeyCode, KeyEvent, KeyEventKind, KeyModifiers};
 use crosstermion::input::Event;
 use dua::{
-    traverse::{BackgroundTraversal, EntryData, Traversal, TreeIndex},
     WalkResult,
+    traverse::{BackgroundTraversal, EntryData, Traversal, TreeIndex},
 };
 use std::path::PathBuf;
-use tui::{backend::Backend, buffer::Buffer, layout::Rect, widgets::Widget, Terminal};
+use tui::{Terminal, backend::Backend, buffer::Buffer, layout::Rect, widgets::Widget};
 
 use super::state::{AppState, Cursor};
 use super::tree_view::TreeView;
@@ -232,8 +232,8 @@ impl AppState {
     where
         B: Backend,
     {
-        use crosstermion::crossterm::event::KeyCode::*;
         use FocussedPane::*;
+        use crosstermion::crossterm::event::KeyCode::*;
 
         let key = match event {
             Event::Key(key) if key.kind != KeyEventKind::Release => {
@@ -275,7 +275,7 @@ impl AppState {
             Char('c') if key.modifiers.contains(KeyModifiers::CONTROL) && !glob_focussed => {
                 return Ok(Some(WalkResult {
                     num_errors: self.stats.io_errors,
-                }))
+                }));
             }
             _ => {
                 handled = false;
@@ -386,10 +386,10 @@ impl AppState {
         });
 
         // If we are displaying the root of the glob search results then cancel the search.
-        if let Some(glob_tree_root) = tree.glob_tree_root {
-            if glob_tree_root == self.navigation().view_root {
-                self.quit_glob_mode(tree, window)
-            }
+        if let Some(glob_tree_root) = tree.glob_tree_root
+            && glob_tree_root == self.navigation().view_root
+        {
+            self.quit_glob_mode(tree, window)
         }
 
         let (paths, remove_root_node, skip_root, use_root_path, index, parent_index) = match what {

src/interactive/app/eventloop.rs

@@ -1,12 +1,12 @@
 use crate::interactive::{
+    DisplayOptions, EntryDataBundle,
     app::tree_view::TreeView,
     widgets::{Column, GlobPane, HelpPane, MainWindow, MarkMode, MarkPane},
-    DisplayOptions, EntryDataBundle,
 };
 use crosstermion::input::Key;
 use dua::traverse::TreeIndex;
 use std::{fs, io, path::PathBuf};
-use tui::{backend::Backend, Terminal};
+use tui::{Terminal, backend::Backend};
 
 use super::state::{AppState, FocussedPane::*};
 
@@ -212,7 +212,7 @@ impl AppState {
             &mut window.glob_pane,
         ) {
             (Main, Some(_), _, _) => Help,
-            (Help, _, Some(ref mut pane), _) => {
+            (Help, _, Some(pane), _) => {
                 pane.set_focus(true);
                 Mark
             }
@@ -221,7 +221,7 @@ impl AppState {
             (Mark, _, _, Some(_)) => Glob,
             (Mark, _, _, _) => Main,
             (Main, None, None, None) => Main,
-            (Main, None, Some(ref mut pane), _) => {
+            (Main, None, Some(pane), _) => {
                 pane.set_focus(true);
                 Mark
             }

src/interactive/app/handlers.rs

@@ -1,12 +1,12 @@
 use std::collections::HashSet;
 use std::path::PathBuf;
 
-use dua::traverse::{BackgroundTraversal, TraversalStats};
 use dua::WalkOptions;
+use dua::traverse::{BackgroundTraversal, TraversalStats};
 
 use crate::interactive::widgets::Column;
 
-use super::{navigation::Navigation, EntryDataBundle, SortMode};
+use super::{EntryDataBundle, SortMode, navigation::Navigation};
 
 #[derive(Default, Copy, Clone, PartialEq)]
 pub enum FocussedPane {

src/interactive/app/state.rs

@@ -6,12 +6,12 @@ use crossbeam::channel::Receiver;
 use crosstermion::input::Event;
 #[cfg(test)]
 use dua::traverse::TraversalStats;
-use dua::{traverse::Traversal, ByteFormat, WalkOptions, WalkResult};
-use tui::{backend::Backend, Terminal};
+use dua::{ByteFormat, WalkOptions, WalkResult, traverse::Traversal};
+use tui::{Terminal, backend::Backend};
 
 use crate::interactive::widgets::MainWindow;
 
-use super::{sorted_entries, state::AppState, DisplayOptions};
+use super::{DisplayOptions, sorted_entries, state::AppState};
 
 /// State and methods representing the interactive disk usage analyser for the terminal
 pub struct TerminalApp {

src/interactive/app/terminal.rs

@@ -7,14 +7,14 @@ use std::ffi::OsString;
 use crate::interactive::app::tests::utils::{into_codes, into_events};
 use crate::interactive::widgets::Column;
 use crate::interactive::{
+    SortMode,
     app::tests::{
+        FIXTURE_PATH,
         utils::{
             fixture_str, index_by_name, initialized_app_and_terminal_from_fixture, into_keys,
             node_by_index, node_by_name,
         },
-        FIXTURE_PATH,
     },
-    SortMode,
 };
 
 #[test]

src/interactive/app/tests/journeys_readonly.rs

@@ -1,5 +1,5 @@
 use crate::interactive::app::tests::utils::{
-    initialized_app_and_terminal_from_paths, into_codes, WritableFixture,
+    WritableFixture, initialized_app_and_terminal_from_paths, into_codes,
 };
 use anyhow::Result;
 use crosstermion::crossterm::event::{KeyCode, KeyEvent, KeyModifiers};