feat(api): simplify, eliminate .clone()

KSXGitHub · KSXGitHub · commit fd98a35b478d · 2025-07-14T06:22:37.000+07:00
diff --git a/src/app.rs b/src/app.rs
@@ -20,10 +20,7 @@ use std::{io::stdin, time::Duration};
 use sysinfo::Disks;
 
 #[cfg(unix)]
-use crate::{
-    get_size::{GetBlockCount, GetBlockSize},
-    hardlink::HardlinkList,
-};
+use crate::get_size::{GetBlockCount, GetBlockSize};
 
 /// The main application.
 pub struct App {
@@ -197,11 +194,7 @@ impl App {
         {
             type HardlinksHandler: hardlink::RecordHardlinks<Self::Size, Self::Reporter>
                 + sub::DeduplicateHardlinkSizes<Self::Size>;
-            fn create_hardlinks_handler(
-                record: <Self::HardlinksHandler as sub::DeduplicateHardlinkSizes<Self::Size>>::HardlinkRecord,
-            ) -> Self::HardlinksHandler;
-            fn init_hardlink_record(
-            ) -> <Self::HardlinksHandler as sub::DeduplicateHardlinkSizes<Self::Size>>::HardlinkRecord;
+            fn create_hardlinks_handler() -> Self::HardlinksHandler;
         }
 
         impl<const REPORT_PROGRESS: bool, SizeGetter>
@@ -211,10 +204,9 @@ impl App {
             SizeGetter::Size: Send + Sync,
         {
             type HardlinksHandler = hardlink::HardlinkIgnorant;
-            fn create_hardlinks_handler((): ()) -> Self::HardlinksHandler {
+            fn create_hardlinks_handler() -> Self::HardlinksHandler {
                 hardlink::HardlinkIgnorant
             }
-            fn init_hardlink_record() {}
         }
 
         #[cfg(unix)]
@@ -225,14 +217,9 @@ impl App {
             SizeGetter::Size: Send + Sync + 'static,
             SizeGetter::Reporter: crate::reporter::Reporter<SizeGetter::Size>,
         {
-            type HardlinksHandler = hardlink::HardlinkAware<'static, Self::Size>;
-            fn create_hardlinks_handler(
-                record: &'static HardlinkList<Self::Size>,
-            ) -> Self::HardlinksHandler {
-                hardlink::HardlinkAware::new(record)
-            }
-            fn init_hardlink_record() -> &'static HardlinkList<Self::Size> {
-                HardlinkList::new().pipe(Box::new).pipe(Box::leak)
+            type HardlinksHandler = hardlink::HardlinkAware<Self::Size>;
+            fn create_hardlinks_handler() -> Self::HardlinksHandler {
+                hardlink::HardlinkAware::new()
             }
         }
 
@@ -256,30 +243,21 @@ impl App {
                     min_ratio,
                     no_sort,
                     ..
-                } => {
-                    const DEDUPLICATE_HARDLINKS: bool = cfg!(unix) && $deduplicate_hardlinks;
-                    let hardlink_record = <$size_getter as HardlinkDeduplicationSystem<DEDUPLICATE_HARDLINKS, $progress>>::init_hardlink_record();
-                    let hardlinks_handler = <
-                        $size_getter as HardlinkDeduplicationSystem<DEDUPLICATE_HARDLINKS, $progress>
-                    >::create_hardlinks_handler(hardlink_record);
-
-                    Sub {
-                        direction: Direction::from_top_down(top_down),
-                        bar_alignment: BarAlignment::from_align_right(align_right),
-                        size_getter: <$size_getter as GetSizeUtils>::INSTANCE,
-                        hardlinks_handler,
-                        hardlink_record,
-                        reporter: <$size_getter as CreateReporter<$progress>>::create_reporter(report_error),
-                        bytes_format: <$size_getter as GetSizeUtils>::formatter(bytes_format),
-                        files,
-                        json_output,
-                        column_width_distribution,
-                        max_depth,
-                        min_ratio,
-                        no_sort,
-                    }
-                    .run()
-                },
+                } => Sub {
+                    direction: Direction::from_top_down(top_down),
+                    bar_alignment: BarAlignment::from_align_right(align_right),
+                    size_getter: <$size_getter as GetSizeUtils>::INSTANCE,
+                    hardlinks_handler: <$size_getter as HardlinkDeduplicationSystem<{ cfg!(unix) && $deduplicate_hardlinks }, $progress>>::create_hardlinks_handler(),
+                    reporter: <$size_getter as CreateReporter<$progress>>::create_reporter(report_error),
+                    bytes_format: <$size_getter as GetSizeUtils>::formatter(bytes_format),
+                    files,
+                    json_output,
+                    column_width_distribution,
+                    max_depth,
+                    min_ratio,
+                    no_sort,
+                }
+                .run(),
             )*} };
         }
 
diff --git a/src/app/sub.rs b/src/app/sub.rs
@@ -22,7 +22,7 @@ where
     Report: ParallelReporter<Size> + Sync,
     Size: size::Size + Into<u64> + Serialize + Send + Sync,
     SizeGetter: GetSize<Size = Size> + Copy + Sync,
-    HardlinksHandler: RecordHardlinks<Size, Report> + DeduplicateHardlinkSizes<Size> + Copy + Sync,
+    HardlinksHandler: RecordHardlinks<Size, Report> + DeduplicateHardlinkSizes<Size> + Sync,
     JsonTree<Size>: Into<JsonDataBody>,
 {
     /// List of files and/or directories.
@@ -43,8 +43,6 @@ where
     pub size_getter: SizeGetter,
     /// Handle to detect, record, and deduplicate hardlinks.
     pub hardlinks_handler: HardlinksHandler,
-    /// Record of detected hardlinks.
-    pub hardlink_record: HardlinksHandler::HardlinkRecord,
     /// Reports measurement progress.
     pub reporter: Report,
     /// Minimal size proportion required to appear.
@@ -58,7 +56,7 @@ where
     Size: size::Size + Into<u64> + Serialize + Send + Sync,
     Report: ParallelReporter<Size> + Sync,
     SizeGetter: GetSize<Size = Size> + Copy + Sync,
-    HardlinksHandler: RecordHardlinks<Size, Report> + DeduplicateHardlinkSizes<Size> + Copy + Sync,
+    HardlinksHandler: RecordHardlinks<Size, Report> + DeduplicateHardlinkSizes<Size> + Sync,
     JsonTree<Size>: Into<JsonDataBody>,
 {
     /// Run the sub program.
@@ -73,7 +71,6 @@ where
             max_depth,
             size_getter,
             hardlinks_handler,
-            hardlink_record,
             reporter,
             min_ratio,
             no_sort,
@@ -88,7 +85,7 @@ where
                     reporter: &reporter,
                     root,
                     size_getter,
-                    hardlinks_recorder: hardlinks_handler,
+                    hardlinks_recorder: &hardlinks_handler,
                     max_depth,
                 }
                 .into()
@@ -100,7 +97,6 @@ where
             return Sub {
                 files: vec![".".into()],
                 hardlinks_handler,
-                hardlink_record,
                 reporter,
                 ..self
             }
@@ -133,8 +129,7 @@ where
             if !no_sort {
                 data_tree.par_sort_by(|left, right| left.size().cmp(&right.size()).reverse());
             }
-            let deduplication_record =
-                HardlinksHandler::deduplicate_hardlink_sizes(&mut data_tree, hardlink_record);
+            let deduplication_record = hardlinks_handler.deduplicate_hardlink_sizes(&mut data_tree);
             (data_tree, deduplication_record)
         };
 
@@ -172,15 +167,13 @@ where
 }
 
 /// Subroutines used by [`Sub`] to deduplicate sizes of detected hardlinks and report about it.
-pub trait DeduplicateHardlinkSizes<Size: size::Size> {
-    /// Record of detected hardlinks.
-    type HardlinkRecord;
+pub trait DeduplicateHardlinkSizes<Size: size::Size>: Sized {
     /// Report created by [`DeduplicateHardlinkSizes::deduplicate_hardlink_sizes`].
     type DeduplicationReport;
     /// Deduplicate the sizes of detected hardlinks and return a report object.
     fn deduplicate_hardlink_sizes(
+        self,
         data_tree: &mut DataTree<OsStringDisplay, Size>,
-        record: Self::HardlinkRecord,
     ) -> Result<Self::DeduplicationReport, RuntimeError>;
     /// Handle the report.
     fn report_deduplication_results(
@@ -194,20 +187,20 @@ pub trait DeduplicateHardlinkSizes<Size: size::Size> {
 }
 
 #[cfg(unix)]
-impl<'a, Size> DeduplicateHardlinkSizes<Size> for crate::hardlink::HardlinkAware<'a, Size>
+impl<Size> DeduplicateHardlinkSizes<Size> for crate::hardlink::HardlinkAware<Size>
 where
     DataTree<OsStringDisplay, Size>: Send,
     Size: size::Size + Sync,
 {
-    type HardlinkRecord = &'a crate::hardlink::HardlinkList<Size>;
-    type DeduplicationReport = &'a crate::hardlink::HardlinkList<Size>;
+    type DeduplicationReport = crate::hardlink::HardlinkList<Size>;
 
     fn deduplicate_hardlink_sizes(
+        self,
         data_tree: &mut DataTree<OsStringDisplay, Size>,
-        record: Self::HardlinkRecord,
     ) -> Result<Self::DeduplicationReport, RuntimeError> {
         use crate::hardlink::LinkPathList;
         use std::path::Path;
+        let record: Self::DeduplicationReport = self.into();
         let hardlink_info: Box<[(Size, LinkPathList)]> = record
             .iter()
             .map(|values| (*values.size(), values.links().clone()))
@@ -248,11 +241,7 @@ where
     fn reflect_deduplication_results(
         report: Self::DeduplicationReport,
     ) -> Result<Option<HardlinkListReflection<Size>>, RuntimeError> {
-        if report.is_empty() {
-            Ok(None)
-        } else {
-            report.clone().into_reflection().pipe(Some).pipe(Ok)
-        }
+        report.into_reflection().pipe(Some).pipe(Ok)
     }
 }
 
@@ -261,12 +250,11 @@ where
     DataTree<OsStringDisplay, Size>: Send,
     Size: size::Size + Sync,
 {
-    type HardlinkRecord = ();
     type DeduplicationReport = ();
 
     fn deduplicate_hardlink_sizes(
+        self,
         _: &mut DataTree<OsStringDisplay, Size>,
-        _: Self::HardlinkRecord,
     ) -> Result<Self::DeduplicationReport, RuntimeError> {
         Ok(())
     }
diff --git a/src/fs_tree_builder.rs b/src/fs_tree_builder.rs
@@ -29,7 +29,7 @@ use std::{
 /// };
 /// let builder = FsTreeBuilder {
 ///     root: std::env::current_dir().unwrap(),
-///     hardlinks_recorder: HardlinkIgnorant,
+///     hardlinks_recorder: &HardlinkIgnorant,
 ///     size_getter: GetApparentSize,
 ///     reporter: &ErrorOnlyReporter::new(ErrorReport::SILENT),
 ///     max_depth: 10,
@@ -42,14 +42,14 @@ where
     Report: Reporter<Size> + Sync + ?Sized,
     Size: size::Size + Send + Sync,
     SizeGetter: GetSize<Size = Size> + Sync,
-    HardlinksRecorder: RecordHardlinks<Size, Report> + Sync,
+    HardlinksRecorder: RecordHardlinks<Size, Report> + Sync + ?Sized,
 {
     /// Root of the directory tree.
     pub root: PathBuf,
     /// Returns size of an item.
     pub size_getter: SizeGetter,
     /// Handle to detect and record hardlinks.
-    pub hardlinks_recorder: HardlinksRecorder,
+    pub hardlinks_recorder: &'a HardlinksRecorder,
     /// Reports progress to external system.
     pub reporter: &'a Report,
     /// Deepest level of descendent display in the graph. The sizes beyond the max depth still count toward total.
@@ -63,7 +63,7 @@ where
     Report: Reporter<Size> + Sync + ?Sized,
     Size: size::Size + Send + Sync,
     SizeGetter: GetSize<Size = Size> + Sync,
-    HardlinksRecorder: RecordHardlinks<Size, Report> + Sync,
+    HardlinksRecorder: RecordHardlinks<Size, Report> + Sync + ?Sized,
 {
     /// Create a [`DataTree`] from an [`FsTreeBuilder`].
     fn from(builder: FsTreeBuilder<Size, SizeGetter, HardlinksRecorder, Report>) -> Self {
diff --git a/src/hardlink/aware.rs b/src/hardlink/aware.rs
@@ -5,28 +5,35 @@ use crate::{
     reporter::{event::HardlinkDetection, Event, Reporter},
     size,
 };
+use derive_more::{AsMut, AsRef, From, Into};
+use pipe_trait::Pipe;
+use smart_default::SmartDefault;
 use std::{fmt::Debug, os::unix::fs::MetadataExt};
 
 /// Be aware of hardlinks. Treat them as links that share space.
 /// Detect files with more than 1 links and record them.
 /// Deduplicate them (remove duplicated size) from total size to
 /// accurately reflect the real size of their containers.
-#[derive(Debug, Clone, Copy)]
-pub struct Aware<'a, Size> {
+#[derive(Debug, SmartDefault, Clone, AsRef, AsMut, From, Into)]
+pub struct Aware<Size> {
     /// Map an inode number to its size and detected paths.
-    record: &'a HardlinkList<Size>,
+    record: HardlinkList<Size>,
 }
 
 pub use Aware as HardlinkAware;
 
-impl<'a, Size> Aware<'a, Size> {
+impl<Size> Aware<Size> {
+    pub fn new() -> Self {
+        HardlinkList::default().pipe(Aware::from)
+    }
+
     /// Create a detector/recorder of hardlinks.
-    pub fn new(record: &'a HardlinkList<Size>) -> Self {
-        Aware { record }
+    pub fn from_record(record: HardlinkList<Size>) -> Self {
+        Aware::from(record)
     }
 }
 
-impl<'a, Size, Report> RecordHardlinks<Size, Report> for Aware<'a, Size>
+impl<Size, Report> RecordHardlinks<Size, Report> for Aware<Size>
 where
     Size: size::Size + Eq + Debug,
     Report: Reporter<Size> + ?Sized,
diff --git a/src/hardlink/record.rs b/src/hardlink/record.rs
@@ -34,6 +34,6 @@ pub trait RecordHardlinks<Size, Reporter: ?Sized> {
 }
 
 /// Do detect and record hardlinks.
-pub type Do<'a, Size> = super::HardlinkAware<'a, Size>;
+pub type Do<Size> = super::HardlinkAware<Size>;
 /// Do not detect nor record hardlinks.
 pub type DoNot = super::HardlinkIgnorant;
diff --git a/tests/_utils.rs b/tests/_utils.rs
@@ -172,7 +172,7 @@ where
     let measure = |suffix: &str| {
         FsTreeBuilder {
             size_getter,
-            hardlinks_recorder: HardlinkIgnorant,
+            hardlinks_recorder: &HardlinkIgnorant,
             reporter: &ErrorOnlyReporter::new(|error| {
                 panic!("Unexpected call to report_error: {error:?}")
             }),
diff --git a/tests/cli_errors.rs b/tests/cli_errors.rs
@@ -132,7 +132,7 @@ fn fs_errors() {
     let builder = FsTreeBuilder {
         root: workspace.to_path_buf(),
         size_getter: GetApparentSize,
-        hardlinks_recorder: HardlinkIgnorant,
+        hardlinks_recorder: &HardlinkIgnorant,
         reporter: &ErrorOnlyReporter::new(ErrorReport::SILENT),
         max_depth: 10,
     };
diff --git a/tests/json.rs b/tests/json.rs
@@ -83,7 +83,7 @@ fn json_output() {
     let builder = FsTreeBuilder {
         root: workspace.to_path_buf(),
         size_getter: GetApparentSize,
-        hardlinks_recorder: HardlinkIgnorant,
+        hardlinks_recorder: &HardlinkIgnorant,
         reporter: &ErrorOnlyReporter::new(ErrorReport::SILENT),
         max_depth: 10,
     };
diff --git a/tests/usual_cli.rs b/tests/usual_cli.rs

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,6 @@ pub trait RecordHardlinks<Size, Reporter: ?Sized> {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`/// Do detect and record hardlinks.`
`37`		`-pub type Do<'a, Size> = super::HardlinkAware<'a, Size>;`
	`37`	`+pub type Do<Size> = super::HardlinkAware<Size>;`
`38`	`38`	`/// Do not detect nor record hardlinks.`
`39`	`39`	`pub type DoNot = super::HardlinkIgnorant;`