feat(api)!: rename UnitAndTree to JsonDataBody

Author: KSXGitHub

src/app.rs

@@ -6,7 +6,7 @@ use crate::{
     args::{Args, Quantity, Threads},
     bytes_format::BytesFormat,
     get_size::{GetApparentSize, GetSize},
-    json_data::{JsonData, UnitAndTree},
+    json_data::{JsonData, JsonDataBody},
     reporter::{ErrorOnlyReporter, ErrorReport, ProgressAndErrorReporter, ProgressReport},
     runtime_error::RuntimeError,
     size,
@@ -60,10 +60,10 @@ impl App {
             let direction = Direction::from_top_down(top_down);
             let bar_alignment = BarAlignment::from_align_right(align_right);
 
-            let unit_and_tree = stdin()
+            let body = stdin()
                 .pipe(serde_json::from_reader::<_, JsonData>)
                 .map_err(RuntimeError::DeserializationFailure)?
-                .unit_and_tree;
+                .body;
 
             macro_rules! visualize {
                 ($reflection:expr, $bytes_format: expr) => {{
@@ -81,9 +81,9 @@ impl App {
                 }};
             }
 
-            let visualization = match unit_and_tree {
-                UnitAndTree::Bytes(reflection) => visualize!(reflection, bytes_format),
-                UnitAndTree::Blocks(reflection) => visualize!(reflection, ()),
+            let visualization = match body {
+                JsonDataBody::Bytes(reflection) => visualize!(reflection, bytes_format),
+                JsonDataBody::Blocks(reflection) => visualize!(reflection, ()),
             };
 
             print!("{visualization}"); // it already ends with "\n", println! isn't needed here.

src/app/sub.rs

@@ -3,7 +3,7 @@ use crate::{
     data_tree::{DataTree, DataTreeReflection},
     fs_tree_builder::FsTreeBuilder,
     get_size::GetSize,
-    json_data::{BinaryVersion, JsonData, SchemaVersion, UnitAndTree},
+    json_data::{BinaryVersion, JsonData, JsonDataBody, SchemaVersion},
     os_string_display::OsStringDisplay,
     reporter::ParallelReporter,
     runtime_error::RuntimeError,
@@ -20,7 +20,7 @@ where
     Report: ParallelReporter<Size> + Sync,
     Size: size::Size + Into<u64> + Serialize + Send + Sync,
     SizeGetter: GetSize<Size = Size> + Copy + Sync,
-    DataTreeReflection<String, Size>: Into<UnitAndTree>,
+    DataTreeReflection<String, Size>: Into<JsonDataBody>,
 {
     /// List of files and/or directories.
     pub files: Vec<PathBuf>,
@@ -51,7 +51,7 @@ where
     Size: size::Size + Into<u64> + Serialize + Send + Sync,
     Report: ParallelReporter<Size> + Sync,
     SizeGetter: GetSize<Size = Size> + Copy + Sync,
-    DataTreeReflection<String, Size>: Into<UnitAndTree>,
+    DataTreeReflection<String, Size>: Into<JsonDataBody>,
 {
     /// Run the sub program.
     pub fn run(self) -> Result<(), RuntimeError> {
@@ -126,15 +126,15 @@ where
         GLOBAL_STATUS_BOARD.clear_line(0);
 
         if json_output {
-            let unit_and_tree: UnitAndTree = data_tree
+            let body: JsonDataBody = 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")
                 .into();
             let json_data = JsonData {
                 schema_version: SchemaVersion,
                 binary_version: Some(BinaryVersion::current()),
-                unit_and_tree,
+                body,
             };
             return serde_json::to_writer(stdout(), &json_data)
                 .map_err(RuntimeError::SerializationFailure);

src/json_data.rs

@@ -18,7 +18,7 @@ use serde::{Deserialize, Serialize};
 #[cfg_attr(feature = "json", derive(Deserialize, Serialize))]
 #[cfg_attr(feature = "json", serde(tag = "unit", content = "tree"))]
 #[cfg_attr(feature = "json", serde(rename_all = "kebab-case"))]
-pub enum UnitAndTree {
+pub enum JsonDataBody {
     /// Tree where size is [bytes](Bytes).
     Bytes(Reflection<String, Bytes>),
     /// Tree where size is [blocks](Blocks).
@@ -38,5 +38,5 @@ pub struct JsonData {
     pub binary_version: Option<BinaryVersion>,
     /// The `"unit"` field and the `"tree"` field.
     #[cfg_attr(feature = "json", serde(flatten))]
-    pub unit_and_tree: UnitAndTree,
+    pub body: JsonDataBody,
 }

tests/json.rs

@@ -73,7 +73,7 @@ fn json_output() {
         .pipe(stdout_text)
         .pipe_as_ref(serde_json::from_str::<JsonData>)
         .expect("parse stdout as JsonData")
-        .unit_and_tree
+        .body
         .pipe(TryInto::<SampleReflection>::try_into)
         .expect("extract reflection")
         .pipe(sanitize_tree_reflection);
@@ -99,7 +99,7 @@ fn json_input() {
     let json_data = JsonData {
         schema_version: SchemaVersion,
         binary_version: None,
-        unit_and_tree: sample_tree().into_reflection().into(),
+        body: sample_tree().into_reflection().into(),
     };
     let json = serde_json::to_string_pretty(&json_data).expect("convert sample tree to JSON");
     eprintln!("JSON: {json}\n");