Update rustfmt options.

fleck/src/fleck_core/crypto.rs

@@ -134,7 +134,7 @@ impl std::fmt::Debug for KeyExchangeState {
             )),
             Self::WaitForResponse(_) => {
                 f.write_str("KeyExchangeState::WaitForResponse { redacted }")
-            }
+            },
             Self::Completed(pkey, _) => f.write_fmt(format_args!(
                 "KeyExchangeState::Completed {{ pkey: {:?}, redacted }}",
                 pkey
@@ -198,7 +198,7 @@ impl EncryptionService {
             KeyExchangeState::NoState => {
                 send();
                 states.insert(with.clone(), KeyExchangeState::WaitForResponse(secret));
-            }
+            },
             KeyExchangeState::Given(pubkey) => {
                 send();
                 let result = secret.diffie_hellman(&pubkey);
@@ -210,14 +210,14 @@ impl EncryptionService {
 
                 log::trace!("Completed key negotiation with peer!");
                 states.insert(with.clone(), KeyExchangeState::Completed(pubkey, sk));
-            }
+            },
             KeyExchangeState::WaitForResponse(secret) => {
                 send();
                 states.insert(with.clone(), KeyExchangeState::WaitForResponse(secret));
-            }
+            },
             KeyExchangeState::Completed(_pubkey, _symmetric_key) => {
                 log::warn!("asked to begin handshake when already have a good encryption key --- did the peer die?");
-            }
+            },
         }
     }
 
@@ -240,7 +240,7 @@ impl EncryptionService {
 
                 drop(states);
                 self.begin_handshake(&peer);
-            }
+            },
             KeyExchangeState::Given(peer_pubkey) => {
                 if peer_pubkey != msg.1.key {
                     log::info!("peer DH key changed!");
@@ -249,7 +249,7 @@ impl EncryptionService {
 
                 drop(states);
                 self.begin_handshake(&peer);
-            }
+            },
             KeyExchangeState::WaitForResponse(secret) => {
                 // key handshake is finished!
                 let result = secret.diffie_hellman(&msg.1.key);
@@ -261,7 +261,7 @@ impl EncryptionService {
 
                 states.insert(peer.clone(), KeyExchangeState::Completed(msg.1.key, sk));
                 drop(states);
-            }
+            },
             KeyExchangeState::Completed(peer_pubkey, _symmetric_key) => {
                 if peer_pubkey == msg.1.key {
                     // it's a repeat, so nothing to do
@@ -271,7 +271,7 @@ impl EncryptionService {
                 states.insert(peer.clone(), KeyExchangeState::Given(msg.1.key));
                 drop(states);
                 self.begin_handshake(&peer);
-            }
+            },
         }
         log::trace!(
             "after processing incoming key exchange message, state: {:?}",

fleck/src/fleck_core/io.rs

@@ -129,10 +129,10 @@ impl IOService {
                         if evt.is_writable() {
                             h.ready_write(h);
                         }
-                    }
+                    },
                     None => {
                         log::trace!("Received event with valid token but no handler!");
-                    }
+                    },
                 }
             }
             drop(handlers);

fleck/src/fleck_core/io/udp.rs

@@ -37,10 +37,10 @@ impl UdpSocketBuilder {
                     socket
                         .join_multicast_v4(&group, &iface)
                         .expect("couldn't join multicast group");
-                }
+                },
                 (IpAddr::V6(_group), IpAddr::V6(_iface)) => {
                     todo!()
-                }
+                },
                 _ => panic!("Multicast specification mixes ipv4 and ipv6 addresses!"),
             }
         }

fleck/src/fleck_core/io/unix.rs

@@ -53,7 +53,7 @@ impl UnixSocketRef {
             UnixSocket::Client(client) => client.peer.get().unwrap().clone(),
             UnixSocket::Server(_) => {
                 panic!("Can't get the connected peer for a UNIX server socket!")
-            }
+            },
         }
     }
 }
@@ -175,13 +175,13 @@ impl UnixServerSocket {
             Err(e) => match e.kind() {
                 std::io::ErrorKind::PermissionDenied => {
                     panic!("couldn't remove existing socket file!")
-                }
+                },
                 std::io::ErrorKind::NotFound => {
                     // this is perfectly okay!
-                }
+                },
                 k => {
                     panic!("Unexpected error removing socket file: {:?}", k)
-                }
+                },
             },
         }
 

fleck/src/fleck_core/msg.rs

@@ -148,10 +148,10 @@ impl MessageService {
                     Ok(content) => {
                         log::trace!("packet deserialized: {:?}", content);
                         api.queue::<MessageChannel<MT>>((message.metadata(), content));
-                    }
+                    },
                     Err(_) => {
                         log::info!("Packet failed deserialization step!");
-                    }
+                    },
                 },
             ),
         );

fleck/src/fleck_core/node.rs

@@ -190,12 +190,12 @@ impl NodeService {
             match map.get(peer) {
                 Some(node) => {
                     msg.node = Some(node.clone());
-                }
+                },
                 None => {
                     // the interesting case, it's a new node!
                     // TODO: send them a request for their public key
                     log::warn!("incoming message from unknown source; peer is {:?}", &peer);
-                }
+                },
             }
         }
     }

fleck/src/service/event.rs

@@ -20,12 +20,12 @@ impl<Host: 'static, Data: 'static> SubscriptionFunction<Host, Data> {
             Self::ByRef(f) => {
                 f(host, &mut data);
                 Some(data)
-            }
+            },
             Self::ByValue(f) => f(host, data),
             Self::Consume(f) => {
                 f(host, data);
                 None
-            }
+            },
         }
     }
 }
@@ -328,8 +328,8 @@ mod tests {
         rc::Rc,
     };
 
-    use super::EventRoot;
     use super::ChannelMetadata;
+    use super::EventRoot;
 
     struct Receiver {
         int_count: Cell<usize>,