cargo fmt

6 files changed, 37 insertions, 21 deletions

diff --git a/src/api/store.rs b/src/api/store.rs
index dd5be94..de5ae9b 100644
--- a/src/api/store.rs
+++ b/src/api/store.rs
@@ -250,7 +250,10 @@ async fn render_traced(
     path: Vec<String>,
 ) -> Result<(Option<JsonValue>, bool), StoreError> {
     state
-        .render(move |doc| store::read_path_traced(doc, &path), |result| result)
+        .render(
+            move |doc| store::read_path_traced(doc, &path),
+            |result| result,
+        )
         .await
 }
 
diff --git a/src/main.rs b/src/main.rs
index 61e484e..850256f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -136,8 +136,7 @@ async fn main() -> Result<()> {
 
     let firewall = Arc::new(Firewall::default());
 
-    let mycelium_transport =
-        Arc::new(mycelium::MyceliumTransport::connect(mycelium_setup).await?);
+    let mycelium_transport = Arc::new(mycelium::MyceliumTransport::connect(mycelium_setup).await?);
     info!(local_id = mycelium_transport.local_id(), "Transport ready");
 
     let state = AppState {
diff --git a/src/mycelium.rs b/src/mycelium.rs
index 3471f71..8d0821b 100644
--- a/src/mycelium.rs
+++ b/src/mycelium.rs
@@ -33,7 +33,6 @@ const TOPIC_PONG: &str = "continuum.v1.pong";
 
 const EMPTY_QUEUE_DELAY: Duration = Duration::from_millis(25);
 
-
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct InboundMessage {
@@ -555,10 +554,7 @@ impl Transport for MyceliumTransport {
     }
 
     async fn send_encoded(&self, message: &EncodedMessage) -> Result<()> {
-        tracing::debug!(
-            payload_bytes = message.body.len(),
-            "Sending message"
-        );
+        tracing::debug!(payload_bytes = message.body.len(), "Sending message");
         let response = self
             .client
             .post(self.messages_endpoint.clone())
@@ -700,9 +696,7 @@ fn decode_payload(topic: &str, payload: &str) -> Result<ParsedMessage, Transport
         }
         TOPIC_PING => Ok(ParsedMessage::Ping(bytes_to_keepalive(&bytes)?)),
         TOPIC_PONG => Ok(ParsedMessage::Pong(bytes_to_keepalive(&bytes)?)),
-        t => {
-            Err(TransportError::UnknownTopic(t.to_string()))
-        }
+        t => Err(TransportError::UnknownTopic(t.to_string())),
     }
 }
 
diff --git a/src/state.rs b/src/state.rs
index e5fe25c..c6d3d86 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -40,7 +40,9 @@ pub(crate) enum PeerMembership {
 pub(crate) enum Liveness {
     Active,
     /// No inbound message for Timing::dormant_after. Kept indefinitely, probed slowly.
-    Dormant { since: Instant },
+    Dormant {
+        since: Instant,
+    },
 }
 
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
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(())
diff --git a/src/sync.rs b/src/sync.rs
index 199f9fb..d9f629e 100644
--- a/src/sync.rs
+++ b/src/sync.rs
@@ -111,7 +111,10 @@ async fn deliver_sync_to_peer(state: &AppState, peer: &str, retry_delivery: bool
                         peer_state.needs_generate = false;
                         let epoch = replica.epoch;
                         let sync_doc = replica.doc.sync();
-                        (epoch, sync_doc.generate_sync_message(&mut peer_state.sync_state))
+                        (
+                            epoch,
+                            sync_doc.generate_sync_message(&mut peer_state.sync_state),
+                        )
                     };
                     let Some(message) = message else {
                         return Ok(None);
@@ -287,11 +290,15 @@ pub(crate) async fn handle_sync(
 
             Ok(Some(
                 check_caught_up
-                    && peer_state.sync_state.their_heads.as_ref().is_some_and(|heads| {
-                        heads
-                            .iter()
-                            .all(|h| replica.doc.get_change_by_hash(h).is_some())
-                    }),
+                    && peer_state
+                        .sync_state
+                        .their_heads
+                        .as_ref()
+                        .is_some_and(|heads| {
+                            heads
+                                .iter()
+                                .all(|h| replica.doc.get_change_by_hash(h).is_some())
+                        }),
             ))
         })
         .await