cargo fmt

1 files changed, 14 insertions, 3 deletions

diff --git a/src/store.rs b/src/store.rs
index 08fe5c0..b905eb4 100644
--- a/src/store.rs
+++ b/src/store.rs
@@ -212,7 +212,10 @@ pub fn read_path_with_conflicts(
     doc: &AutoCommit,
     path: &[String],
 ) -> Result<Option<(JsonValue, Vec<ConflictReport>)>, StoreError> {
-    let mut log = ConflictLog { want_values: true, ..Default::default() };
+    let mut log = ConflictLog {
+        want_values: true,
+        ..Default::default()
+    };
     let value = read_path_inner(doc, path, Some(&mut log))?;
     Ok(value.map(|value| (value, log.reports)))
 }
@@ -471,7 +474,11 @@ impl ConflictLog {
                 Ok(CandidateReport {
                     op_id: op_id_string(id),
                     selected,
-                    value: if with_values { Some(value_to_json(doc, value, id)?) } else { None },
+                    value: if with_values {
+                        Some(value_to_json(doc, value, id)?)
+                    } else {
+                        None
+                    },
                 })
             })
             .collect::<Result<Vec<_>, StoreError>>()?;
@@ -482,7 +489,11 @@ impl ConflictLog {
         self.reports.push(ConflictReport {
             path,
             ancestor: self.in_ancestors,
-            resolution: if merged { Resolution::MergedMaps } else { Resolution::NewestWins },
+            resolution: if merged {
+                Resolution::MergedMaps
+            } else {
+                Resolution::NewestWins
+            },
             candidates,
         });
         Ok(())