cargo fmt

cli/src/main.rs

@@ -12,10 +12,7 @@ use dialoguer::Input;
 use futures::{future::Either, Future, FutureExt};
 use indicatif::{MultiProgress, ProgressBar};
 use magic_wormhole::PgpWordList;
-use std::{
-    io::Write,
-    path::{PathBuf},
-};
+use std::{io::Write, path::PathBuf};
 
 use magic_wormhole::{
     dilated_transfer, forwarding, transfer, transit, MailboxConnection, Wormhole,

src/core/wordlist.rs

@@ -1,10 +1,8 @@
 use rand::{rngs::OsRng, seq::SliceRandom};
 use serde_json::{self};
 
-
 use dialoguer::Completion;
-use std::collections::HashMap;
-use std::fs;
+use std::{collections::HashMap, fs};
 
 pub struct PgpWordList {
     words: Vec<Vec<String>>,
@@ -14,7 +12,7 @@ pub struct PgpWordList {
 impl PgpWordList {
     pub fn choose_words(&self) -> String {
         let mut rng = OsRng;
-        
+
         let components: Vec<String> = self
             .words
             .iter()

src/dilation/manager.rs

@@ -38,7 +38,6 @@ pub struct ManagerMachine {
 #[cfg_attr(test, automock)]
 impl ManagerMachine {
     pub fn new(side: MySide) -> Self {
-
         ManagerMachine {
             side,
             role: Role::Follower,
@@ -184,7 +183,6 @@ impl ManagerMachine {
                     "processing event finished: state={}, command={}",
                     self.state.unwrap(),
                     command
-
                         .map(|cmd| cmd.to_string())
                         .unwrap_or("n/a".to_string())
                 );

src/lib.rs

@@ -41,9 +41,9 @@ pub mod uri;
 
 pub use crate::core::{
     key::{GenericKey, Key, KeyPurpose, WormholeKey},
+    rendezvous,
     wordlist::PgpWordList,
-    rendezvous, AppConfig, AppID, Code, MailboxConnection, Mood, Nameplate, Wormhole,
-    WormholeError,
+    AppConfig, AppID, Code, MailboxConnection, Mood, Nameplate, Wormhole, WormholeError,
 };
 
 #[cfg(feature = "dilation")]

src/transfer/v2.rs

@@ -108,9 +108,7 @@ async fn make_transit(
 
     /* Send our transit hints */
     wormhole
-        .send_json(&PeerMessage::transit_v2(
-            (**connector.our_hints()).clone(),
-        ))
+        .send_json(&PeerMessage::transit_v2((**connector.our_hints()).clone()))
         .await?;
 
     /* Receive their transit hints */
@@ -210,7 +208,7 @@ async fn send_inner(
 ) -> Result<(), TransferError> {
     transit.send_record(&{
         /* This must be split into two statements to appease the borrow checker (unfortunate side effect of borrow-through) */
-        
+
         PeerMessageV2::Offer((&offer).into()).ser_msgpack()
     }).await?;
 
@@ -585,20 +583,20 @@ async fn receive_inner(
         };
     }
 
-    let _transfer_ack = match PeerMessageV2::de_msgpack(&transit.receive_record().await?)?
-        .check_err()?
-    {
-        PeerMessageV2::TransferAck(transfer_ack) => transfer_ack,
-        PeerMessageV2::FileStart(_) => {
-            bail!(TransferError::Protocol(
-                "Unexpected message: got 'file-start' but did not expect any more files".to_string()
-                    .into_boxed_str()
-            ))
-        },
-        other => {
-            bail!(TransferError::unexpected_message("transfer-ack", other))
-        },
-    };
+    let _transfer_ack =
+        match PeerMessageV2::de_msgpack(&transit.receive_record().await?)?.check_err()? {
+            PeerMessageV2::TransferAck(transfer_ack) => transfer_ack,
+            PeerMessageV2::FileStart(_) => {
+                bail!(TransferError::Protocol(
+                    "Unexpected message: got 'file-start' but did not expect any more files"
+                        .to_string()
+                        .into_boxed_str()
+                ))
+            },
+            other => {
+                bail!(TransferError::unexpected_message("transfer-ack", other))
+            },
+        };
 
     Ok(())
 }