Merge branch 'main' of github.com:TravisWheelerLab/mdr

Author: kyclark

src/metadata.rs

@@ -86,11 +86,11 @@ pub struct Meta {
 
     #[validate(nested)]
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub additional_files: Option<Vec<AdditionalFile>>,
+    pub water: Option<Water>,
 
     #[validate(nested)]
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub water: Option<Water>,
+    pub additional_files: Option<Vec<AdditionalFile>>,
 
     #[validate(nested)]
     #[serde(skip_serializing_if = "Option::is_none")]

src/types.rs

@@ -436,7 +436,7 @@ pub struct ImportResult {
 pub struct PushResult {
     pub src: String,
     pub dest: String,
-    pub size: u32,
+    pub size: u64,
 }
 
 // --------------------------------------------------