Skip to content

Commit 1383195

Browse files
committed
Preserve root paths
resolve #30
1 parent da5a565 commit 1383195

File tree

5 files changed

+6
-104
lines changed

5 files changed

+6
-104
lines changed

src/fs_tree_builder.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use super::{
44
reporter::{error_report::Operation::*, ErrorReport, Event, Reporter},
55
size::Size,
66
tree_builder::{Info, TreeBuilder},
7-
utils::path_name,
87
};
98
use pipe_trait::Pipe;
109
use std::{
@@ -43,7 +42,7 @@ where
4342
} = builder;
4443

4544
TreeBuilder::<PathBuf, OsStringDisplay, Data, _, _> {
46-
name: path_name(&root),
45+
name: OsStringDisplay::os_string_from(&root),
4746

4847
path: root,
4948

src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#![deny(warnings)]
22

3-
mod utils;
4-
53
#[cfg(feature = "json")]
64
pub use serde;
75
#[cfg(feature = "json")]

src/utils.rs

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/utils/test_path_name.rs

Lines changed: 0 additions & 82 deletions
This file was deleted.

tests/_utils.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,12 @@ where
144144
.into_reflection()
145145
};
146146

147+
let sub = |suffix: &str| root.join(suffix).pipe(OsStringDisplay::os_string_from);
148+
147149
assert_eq!(
148150
measure("flat"),
149151
sanitize_tree_reflection(DataTreeReflection {
150-
name: OsStringDisplay::os_string_from("flat"),
152+
name: sub("flat"),
151153
data: suffix_size!("flat", "flat/0", "flat/1", "flat/2", "flat/3"),
152154
children: vec![
153155
DataTreeReflection {
@@ -177,7 +179,7 @@ where
177179
assert_eq!(
178180
measure("nested"),
179181
sanitize_tree_reflection(DataTreeReflection {
180-
name: OsStringDisplay::os_string_from("nested"),
182+
name: sub("nested"),
181183
data: suffix_size!("nested", "nested/0", "nested/0/1"),
182184
children: vec![DataTreeReflection {
183185
name: OsStringDisplay::os_string_from("0"),
@@ -194,7 +196,7 @@ where
194196
assert_eq!(
195197
measure("empty-dir"),
196198
sanitize_tree_reflection(DataTreeReflection {
197-
name: OsStringDisplay::os_string_from("empty-dir"),
199+
name: sub("empty-dir"),
198200
data: suffix_size!("empty-dir"),
199201
children: Vec::new(),
200202
}),

0 commit comments

Comments
 (0)