move tools::json to pbs-tools

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/pbs-tools/src/json.rs b/pbs-tools/src/json.rs
new file mode 100644 (file)
index 0000000..7a43c70
--- /dev/null
+++ b/pbs-tools/src/json.rs
@@ -0,0 +1,49 @@
+use anyhow::{bail, Error};
+use serde_json::Value;
+
+// Generate canonical json
+pub fn to_canonical_json(value: &Value) -> Result<Vec<u8>, Error> {
+    let mut data = Vec::new();
+    write_canonical_json(value, &mut data)?;
+    Ok(data)
+}
+
+pub fn write_canonical_json(value: &Value, output: &mut Vec<u8>) -> Result<(), Error> {
+    match value {
+        Value::Null => bail!("got unexpected null value"),
+        Value::String(_) | Value::Number(_) | Value::Bool(_) => {
+            serde_json::to_writer(output, &value)?;
+        }
+        Value::Array(list) => {
+            output.push(b'[');
+            let mut iter = list.iter();
+            if let Some(item) = iter.next() {
+                write_canonical_json(item, output)?;
+                for item in iter {
+                    output.push(b',');
+                    write_canonical_json(item, output)?;
+                }
+            }
+            output.push(b']');
+        }
+        Value::Object(map) => {
+            output.push(b'{');
+            let mut keys: Vec<&str> = map.keys().map(String::as_str).collect();
+            keys.sort_unstable();
+            let mut iter = keys.into_iter();
+            if let Some(key) = iter.next() {
+                serde_json::to_writer(&mut *output, &key)?;
+                output.push(b':');
+                write_canonical_json(&map[key], output)?;
+                for key in iter {
+                    output.push(b',');
+                    serde_json::to_writer(&mut *output, &key)?;
+                    output.push(b':');
+                    write_canonical_json(&map[key], output)?;
+                }
+            }
+            output.push(b'}');
+        }
+    }
+    Ok(())
+}

diff --git a/pbs-tools/src/lib.rs b/pbs-tools/src/lib.rs
index 3acdd9012691730ba5bf7aa50edce556d7eab9cb..254dd41cef20e6ee982788975e8126316ad8b2d6 100644 (file)
--- a/pbs-tools/src/lib.rs
+++ b/pbs-tools/src/lib.rs
@@ -1,8 +1,9 @@
 pub mod borrow;
 pub mod format;
 pub mod fs;
+pub mod json;
 pub mod nom;
 pub mod str;
 
 mod command;
-pub use command::{run_command, command_output, command_output_as_string};
+pub use command::{command_output, command_output_as_string, run_command};

diff --git a/src/tools/json.rs b/src/tools/json.rs
deleted file mode 100644 (file)
index 7a43c70..0000000
--- a/src/tools/json.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use anyhow::{bail, Error};
-use serde_json::Value;
-
-// Generate canonical json
-pub fn to_canonical_json(value: &Value) -> Result<Vec<u8>, Error> {
-    let mut data = Vec::new();
-    write_canonical_json(value, &mut data)?;
-    Ok(data)
-}
-
-pub fn write_canonical_json(value: &Value, output: &mut Vec<u8>) -> Result<(), Error> {
-    match value {
-        Value::Null => bail!("got unexpected null value"),
-        Value::String(_) | Value::Number(_) | Value::Bool(_) => {
-            serde_json::to_writer(output, &value)?;
-        }
-        Value::Array(list) => {
-            output.push(b'[');
-            let mut iter = list.iter();
-            if let Some(item) = iter.next() {
-                write_canonical_json(item, output)?;
-                for item in iter {
-                    output.push(b',');
-                    write_canonical_json(item, output)?;
-                }
-            }
-            output.push(b']');
-        }
-        Value::Object(map) => {
-            output.push(b'{');
-            let mut keys: Vec<&str> = map.keys().map(String::as_str).collect();
-            keys.sort_unstable();
-            let mut iter = keys.into_iter();
-            if let Some(key) = iter.next() {
-                serde_json::to_writer(&mut *output, &key)?;
-                output.push(b':');
-                write_canonical_json(&map[key], output)?;
-                for key in iter {
-                    output.push(b',');
-                    serde_json::to_writer(&mut *output, &key)?;
-                    output.push(b':');
-                    write_canonical_json(&map[key], output)?;
-                }
-            }
-            output.push(b'}');
-        }
-    }
-    Ok(())
-}