chore(git): merge from master

Author: KSXGitHub

src/app.rs

@@ -3,7 +3,7 @@ pub mod sub;
 pub use sub::Sub;
 
 use crate::{
-    args::{Args, Quantity},
+    args::{Args, Quantity, Threads},
     get_size::GetApparentSize,
     json_data::{JsonData, UnitAndTree},
     reporter::{ErrorOnlyReporter, ErrorReport, ProgressAndErrorReporter, ProgressReport},
@@ -12,8 +12,10 @@ use crate::{
     visualizer::{BarAlignment, Direction, Visualizer},
 };
 use clap::Parser;
+use hdd::any_path_is_in_hdd;
 use pipe_trait::Pipe;
 use std::{io::stdin, time::Duration};
+use sysinfo::Disks;
 
 #[cfg(unix)]
 use crate::{
@@ -44,6 +46,27 @@ impl App {
         //
         // The other operations which are invoked frequently should not utilize dynamic dispatch.
 
+        let threads = match self.args.threads {
+            Threads::Auto => {
+                let disks = Disks::new_with_refreshed_list();
+                if any_path_is_in_hdd::<hdd::RealApi>(&self.args.files, &disks) {
+                    eprintln!("warning: HDD detected, the thread limit will be set to 1");
+                    Some(1)
+                } else {
+                    None
+                }
+            }
+            Threads::Max => None,
+            Threads::Fixed(threads) => Some(threads),
+        };
+
+        if let Some(threads) = threads {
+            rayon::ThreadPoolBuilder::new()
+                .num_threads(threads)
+                .build_global()
+                .unwrap_or_else(|_| eprintln!("warning: Failed to set thread limit to {threads}"));
+        }
+
         let column_width_distribution = self.args.column_width_distribution();
 
         if self.args.json_input {
@@ -141,7 +164,6 @@ impl App {
                     max_depth,
                     min_ratio,
                     no_sort,
-                    threads,
                     ..
                 } => Sub {
                     direction: Direction::from_top_down(top_down),
@@ -155,7 +177,6 @@ impl App {
                     max_depth,
                     min_ratio,
                     no_sort,
-                    threads,
                 }
                 .run(),
             )*} };
@@ -204,3 +225,6 @@ impl App {
         }
     }
 }
+
+mod hdd;
+mod mount_point;

src/app/sub/hdd.rs renamed to src/app/hdd.rs

@@ -1,8 +1,5 @@
-mod hdd;
-mod mount_point;
-
 use crate::{
-    args::{Fraction, Threads},
+    args::Fraction,
     data_tree::{DataTree, DataTreeReflection},
     fs_tree_builder::FsTreeBuilder,
     get_size::GetSize,
@@ -14,10 +11,8 @@ use crate::{
     status_board::GLOBAL_STATUS_BOARD,
     visualizer::{BarAlignment, ColumnWidthDistribution, Direction, Visualizer},
 };
-use hdd::any_path_is_in_hdd;
 use serde::Serialize;
 use std::{io::stdout, iter::once, num::NonZeroUsize, path::PathBuf};
-use sysinfo::Disks;
 
 /// The sub program of the main application.
 pub struct Sub<Size, SizeGetter, Report>
@@ -47,8 +42,6 @@ where
     pub reporter: Report,
     /// Minimal size proportion required to appear.
     pub min_ratio: Fraction,
-    /// The number of threads [`rayon`] can use.
-    pub threads: Threads,
     /// Preserve order of entries.
     pub no_sort: bool,
 }
@@ -73,31 +66,9 @@ where
             size_getter,
             reporter,
             min_ratio,
-            threads,
             no_sort,
         } = self;
 
-        let threads = match threads {
-            Threads::Auto => {
-                let disks = Disks::new_with_refreshed_list();
-                if any_path_is_in_hdd::<hdd::RealApi>(&files, &disks) {
-                    eprintln!("warning: HDD detected, the thread limit will be set to 1");
-                    Some(1)
-                } else {
-                    None
-                }
-            }
-            Threads::Max => None,
-            Threads::Fixed(threads) => Some(threads),
-        };
-
-        if let Some(threads) = threads {
-            rayon::ThreadPoolBuilder::new()
-                .num_threads(threads)
-                .build_global()
-                .unwrap_or_else(|_| eprintln!("warning: Failed to set thread limit to {threads}"));
-        }
-
         let mut iter = files
             .into_iter()
             .map(|root| -> DataTree<OsStringDisplay, Size> {