fix(json): move "shared-inodes" out of "tree"

Author: KSXGitHub

src/app.rs

@@ -86,8 +86,8 @@ impl App {
             }
 
             let visualization = match unit_and_tree {
-                UnitAndTree::Bytes(tree) => visualize!(tree.data, bytes_format),
-                UnitAndTree::Blocks(tree) => visualize!(tree.data, ()),
+                UnitAndTree::Bytes(tree) => visualize!(tree.tree, bytes_format),
+                UnitAndTree::Blocks(tree) => visualize!(tree.tree, ()),
             };
 
             print!("{visualization}"); // it already ends with "\n", println! isn't needed here.

src/app/sub.rs

@@ -142,13 +142,13 @@ where
         GLOBAL_STATUS_BOARD.clear_line(0);
 
         if json_output {
-            let data = data_tree
+            let tree = data_tree
                 .into_reflection() // I really want to use std::mem::transmute here but can't.
                 .par_convert_names_to_utf8() // TODO: allow non-UTF8 somehow.
                 .expect("convert all names from raw string to UTF-8");
             let shared_inodes = deduplication_record?.pipe(Hook::reflect_deduplication_results)?;
             let json_tree = JsonTree {
-                data,
+                tree,
                 shared_inodes,
             };
             let json_data = JsonData {

src/json_data.rs

@@ -22,8 +22,7 @@ pub struct JsonTree<Size: size::Size> {
     /// The main data of the tree.
     #[deref]
     #[deref_mut]
-    #[cfg_attr(feature = "json", serde(flatten))]
-    pub data: DataTreeReflection<String, Size>,
+    pub tree: DataTreeReflection<String, Size>,
     /// Optional list of shared inodes, their sizes, and their many links.
     #[cfg_attr(feature = "json", serde(skip_serializing_if = "Option::is_none"))]
     pub shared_inodes: Option<HardlinkListReflection<Size>>,
@@ -32,7 +31,7 @@ pub struct JsonTree<Size: size::Size> {
 /// The `"unit"` field and the `"tree"` field of [`JsonData`].
 #[derive(Debug, Clone, From, TryInto)]
 #[cfg_attr(feature = "json", derive(Deserialize, Serialize))]
-#[cfg_attr(feature = "json", serde(tag = "unit", content = "tree"))]
+#[cfg_attr(feature = "json", serde(tag = "unit"))]
 #[cfg_attr(feature = "json", serde(rename_all = "kebab-case"))]
 pub enum UnitAndTree {
     /// Tree where size is [bytes](Bytes).

tests/json.rs

@@ -77,7 +77,7 @@ fn json_output() {
         .unit_and_tree
         .pipe(TryInto::<SampleJsonTree>::try_into)
         .expect("extract reflection")
-        .data
+        .tree
         .pipe(sanitize_tree_reflection);
     dbg!(&actual);
     let builder = FsTreeBuilder {
@@ -100,7 +100,7 @@ fn json_output() {
 #[test]
 fn json_input() {
     let json_tree = JsonTree {
-        data: sample_tree().into_reflection(),
+        tree: sample_tree().into_reflection(),
         shared_inodes: None,
     };
     let json_data = JsonData {