Merge branch 'hardlink-awareness' into tmp.test.windows-path-join-absolute

Author: KSXGitHub

src/data_tree/hardlink.rs

@@ -11,6 +11,7 @@ where
     Size: size::Size + Sync,
 {
     /// Reduce the size of the directories that have hardlinks.
+    #[cfg_attr(not(unix), expect(unused))]
     pub(crate) fn par_deduplicate_hardlinks(&mut self, hardlink_info: &[(Size, Vec<&Path>)]) {
         if hardlink_info.is_empty() {
             return;

src/hardlink/deduplicate.rs

@@ -16,6 +16,7 @@ pub trait DeduplicateSharedSize<Size: size::Size>: Sized {
 }
 
 /// Do deduplicate the sizes of hardlinks.
+#[cfg(unix)]
 pub type Do<Size> = super::HardlinkAware<Size>;
 /// Do not deduplicate the sizes of hardlinks.
 pub type DoNot = super::HardlinkIgnorant;

src/hardlink/hardlink_list.rs

@@ -60,7 +60,10 @@ impl<Size> HardlinkList<Size> {
     }
 }
 
-/// Error that occurs when a different size was detected for the same [`ino`](std::os::unix::fs::MetadataExt::ino).
+/// Error that occurs when a different size was detected for the same [`ino`][ino].
+///
+/// <!-- Should have been `std::os::unix::fs::MetadataExt::ino` but it would error on Windows -->
+/// [ino]: https://doc.rust-lang.org/std/os/unix/fs/trait.MetadataExt.html#tymethod.ino
 #[derive(Debug, Display, Error)]
 #[display(bound(Size: Debug))]
 #[display("Size for inode {ino} changed from {recorded:?} to {detected:?}")]
@@ -83,6 +86,7 @@ where
     Size: size::Size,
 {
     /// Add an entry to the record.
+    #[cfg_attr(not(unix), expect(unused))]
     pub(crate) fn add(
         &self,
         ino: InodeNumber,

src/hardlink/record.rs

@@ -36,6 +36,7 @@ pub trait RecordHardlinks<Size, Reporter: ?Sized> {
 }
 
 /// Do detect and record hardlinks.
+#[cfg(unix)]
 pub type Do<Size> = super::HardlinkAware<Size>;
 /// Do not detect nor record hardlinks.
 pub type DoNot = super::HardlinkIgnorant;

tests/cli_errors.rs

@@ -1,10 +1,18 @@
 #![cfg(feature = "cli")]
+#![cfg_attr(not(unix), allow(unused))] // TODO: remove this after merging from master
 
 pub mod _utils;
 pub use _utils::*;
 
 use command_extra::CommandExtra;
+use pipe_trait::Pipe;
+use pretty_assertions::assert_eq;
+use std::process::{Command, Output, Stdio};
+use text_block_macros::text_block;
+
+#[cfg(unix)]
 use maplit::btreeset;
+#[cfg(unix)]
 use parallel_disk_usage::{
     bytes_format::BytesFormat,
     data_tree::DataTree,
@@ -15,14 +23,8 @@ use parallel_disk_usage::{
     reporter::{ErrorOnlyReporter, ErrorReport},
     visualizer::{BarAlignment, ColumnWidthDistribution, Direction, Visualizer},
 };
-use pipe_trait::Pipe;
-use pretty_assertions::assert_eq;
-use std::{
-    collections::BTreeSet,
-    path::Path,
-    process::{Command, Output, Stdio},
-};
-use text_block_macros::text_block;
+#[cfg(unix)]
+use std::{collections::BTreeSet, path::Path};
 
 #[cfg(windows)]
 fn test_path_join_absolute() {

tests/data_tree_reflection.rs

@@ -136,7 +136,15 @@ fn display_excessive_children() {
         .par_try_into_tree()
         .expect_err("create error")
         .to_string();
-    let expected = r#"ExcessiveChildren: "root/b/0" (Bytes(321)) is less than a child named "def" (Bytes(456))"#;
+    let expected = if cfg!(unix) {
+        r#"ExcessiveChildren: "root/b/0" (Bytes(321)) is less than a child named "def" (Bytes(456))"#
+    } else if cfg!(windows) {
+        // TODO: stop using debug format
+        r#"ExcessiveChildren: "root\\b\\0" (Bytes(321)) is less than a child named "def" (Bytes(456))"#
+    } else {
+        eprintln!("ACTUAL: {actual}");
+        panic!("This platform isn't supported!");
+    };
     assert_eq!(actual, expected);
 }
 

tests/fs_tree_builder.rs

@@ -1,13 +1,13 @@
 pub mod _utils;
 pub use _utils::*;
 
-use parallel_disk_usage::{
-    get_size::{GetApparentSize, GetBlockCount, GetBlockSize},
-    size::Bytes,
-};
+use parallel_disk_usage::{get_size::GetApparentSize, size::Bytes};
 
 #[cfg(unix)]
-use parallel_disk_usage::size::Blocks;
+use parallel_disk_usage::{
+    get_size::{GetBlockCount, GetBlockSize},
+    size::Blocks,
+};
 
 #[test]
 fn len_as_bytes() {

tests/usual_cli.rs

@@ -8,7 +8,7 @@ use parallel_disk_usage::{
     bytes_format::BytesFormat,
     data_tree::DataTree,
     fs_tree_builder::FsTreeBuilder,
-    get_size::{GetApparentSize, GetBlockCount, GetBlockSize},
+    get_size::GetApparentSize,
     hardlink::HardlinkIgnorant,
     os_string_display::OsStringDisplay,
     reporter::{ErrorOnlyReporter, ErrorReport},
@@ -18,6 +18,9 @@ use pipe_trait::Pipe;
 use pretty_assertions::assert_eq;
 use std::process::{Command, Stdio};
 
+#[cfg(unix)]
+use parallel_disk_usage::get_size::{GetBlockCount, GetBlockSize};
+
 fn stdio(command: Command) -> Command {
     command
         .with_stdin(Stdio::null())
@@ -448,14 +451,13 @@ fn quantity_block_count() {
     assert_eq!(actual, expected);
 }
 
-#[cfg(unix)]
 #[test]
 fn bytes_format_plain() {
     let workspace = SampleWorkspace::default();
     let actual = Command::new(PDU)
         .with_current_dir(&workspace)
         .with_arg("--total-width=100")
-        .with_arg("--quantity=block-size")
+        .with_arg("--quantity=apparent-size")
         .with_arg("--bytes-format=plain")
         .pipe(stdio)
         .output()
@@ -465,7 +467,7 @@ fn bytes_format_plain() {
 
     let builder = FsTreeBuilder {
         root: workspace.to_path_buf(),
-        size_getter: GetBlockSize,
+        size_getter: GetApparentSize,
         hardlinks_recorder: &HardlinkIgnorant,
         reporter: &ErrorOnlyReporter::new(ErrorReport::SILENT),
         max_depth: 10,
@@ -488,14 +490,13 @@ fn bytes_format_plain() {
     assert_eq!(actual, expected);
 }
 
-#[cfg(unix)]
 #[test]
 fn bytes_format_metric() {
     let workspace = SampleWorkspace::default();
     let actual = Command::new(PDU)
         .with_current_dir(&workspace)
         .with_arg("--total-width=100")
-        .with_arg("--quantity=block-size")
+        .with_arg("--quantity=apparent-size")
         .with_arg("--bytes-format=metric")
         .pipe(stdio)
         .output()
@@ -505,7 +506,7 @@ fn bytes_format_metric() {
 
     let builder = FsTreeBuilder {
         root: workspace.to_path_buf(),
-        size_getter: GetBlockSize,
+        size_getter: GetApparentSize,
         hardlinks_recorder: &HardlinkIgnorant,
         reporter: &ErrorOnlyReporter::new(ErrorReport::SILENT),
         max_depth: 10,
@@ -528,14 +529,13 @@ fn bytes_format_metric() {
     assert_eq!(actual, expected);
 }
 
-#[cfg(unix)]
 #[test]
 fn bytes_format_binary() {
     let workspace = SampleWorkspace::default();
     let actual = Command::new(PDU)
         .with_current_dir(&workspace)
         .with_arg("--total-width=100")
-        .with_arg("--quantity=block-size")
+        .with_arg("--quantity=apparent-size")
         .with_arg("--bytes-format=binary")
         .pipe(stdio)
         .output()
@@ -545,7 +545,7 @@ fn bytes_format_binary() {
 
     let builder = FsTreeBuilder {
         root: workspace.to_path_buf(),
-        size_getter: GetBlockSize,
+        size_getter: GetApparentSize,
         hardlinks_recorder: &HardlinkIgnorant,
         reporter: &ErrorOnlyReporter::new(ErrorReport::SILENT),
         max_depth: 10,