Run rustfmt, clean up aquatic_http_protocol/Cargo.toml

aquatic_udp/src/lib/common.rs

@@ -1,6 +1,6 @@
-use std::net::{SocketAddr, IpAddr, Ipv4Addr, Ipv6Addr};
-use std::sync::{Arc, atomic::AtomicUsize};
 use std::hash::Hash;
+use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
+use std::sync::{atomic::AtomicUsize, Arc};
 
 use hashbrown::HashMap;
 use indexmap::IndexMap;
@@ -9,56 +9,45 @@ use parking_lot::Mutex;
 pub use aquatic_common::ValidUntil;
 pub use aquatic_udp_protocol::*;
 
-
 pub const MAX_PACKET_SIZE: usize = 4096;
 
-
 pub trait Ip: Hash + PartialEq + Eq + Clone + Copy {
     fn ip_addr(self) -> IpAddr;
 }
 
-
 impl Ip for Ipv4Addr {
     fn ip_addr(self) -> IpAddr {
         IpAddr::V4(self)
     }
 }
 
-
 impl Ip for Ipv6Addr {
     fn ip_addr(self) -> IpAddr {
         IpAddr::V6(self)
     }
 }
 
-
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ConnectionKey {
     pub connection_id: ConnectionId,
-    pub socket_addr: SocketAddr
+    pub socket_addr: SocketAddr,
 }
 
-
 pub type ConnectionMap = HashMap<ConnectionKey, ValidUntil>;
 
-
 #[derive(PartialEq, Eq, Hash, Clone, Copy, Debug)]
 pub enum PeerStatus {
     Seeding,
     Leeching,
-    Stopped
+    Stopped,
 }
 
-
 impl PeerStatus {
     /// Determine peer status from announce event and number of bytes left.
-    /// 
+    ///
     /// Likely, the last branch will be taken most of the time.
     #[inline]
-    pub fn from_event_and_bytes_left(
-        event: AnnounceEvent,
-        bytes_left: NumberOfBytes
-    ) -> Self {
+    pub fn from_event_and_bytes_left(event: AnnounceEvent, bytes_left: NumberOfBytes) -> Self {
         if event == AnnounceEvent::Stopped {
             Self::Stopped
         } else if bytes_left.0 == 0 {
@@ -69,45 +58,39 @@ impl PeerStatus {
     }
 }
 
-
 #[derive(Clone, Debug)]
 pub struct Peer<I: Ip> {
     pub ip_address: I,
     pub port: Port,
     pub status: PeerStatus,
-    pub valid_until: ValidUntil
+    pub valid_until: ValidUntil,
 }
 
-
-impl <I: Ip>Peer<I> {
+impl<I: Ip> Peer<I> {
     #[inline(always)]
     pub fn to_response_peer(&self) -> ResponsePeer {
         ResponsePeer {
             ip_address: self.ip_address.ip_addr(),
-            port: self.port
+            port: self.port,
         }
     }
 }
 
-
 #[derive(PartialEq, Eq, Hash, Clone, Copy)]
 pub struct PeerMapKey<I: Ip> {
     pub ip: I,
-    pub peer_id: PeerId
+    pub peer_id: PeerId,
 }
 
-
 pub type PeerMap<I> = IndexMap<PeerMapKey<I>, Peer<I>>;
 
-
 pub struct TorrentData<I: Ip> {
     pub peers: PeerMap<I>,
     pub num_seeders: usize,
     pub num_leechers: usize,
 }
 
-
-impl <I: Ip>Default for TorrentData<I> {
+impl<I: Ip> Default for TorrentData<I> {
     fn default() -> Self {
         Self {
             peers: IndexMap::new(),
@@ -117,17 +100,14 @@ impl <I: Ip>Default for TorrentData<I> {
     }
 }
 
-
 pub type TorrentMap<I> = HashMap<InfoHash, TorrentData<I>>;
 
-
 #[derive(Default)]
 pub struct TorrentMaps {
     pub ipv4: TorrentMap<Ipv4Addr>,
     pub ipv6: TorrentMap<Ipv6Addr>,
 }
 
-
 #[derive(Default)]
 pub struct Statistics {
     pub requests_received: AtomicUsize,
@@ -137,7 +117,6 @@ pub struct Statistics {
     pub bytes_sent: AtomicUsize,
 }
 
-
 #[derive(Clone)]
 pub struct State {
     pub connections: Arc<Mutex<ConnectionMap>>,
@@ -145,7 +124,6 @@ pub struct State {
     pub statistics: Arc<Statistics>,
 }
 
-
 impl Default for State {
     fn default() -> Self {
         Self {
@@ -156,11 +134,10 @@ impl Default for State {
     }
 }
 
-
 #[cfg(test)]
 mod tests {
     #[test]
-    fn test_peer_status_from_event_and_bytes_left(){
+    fn test_peer_status_from_event_and_bytes_left() {
         use crate::common::*;
 
         use PeerStatus::*;
@@ -179,4 +156,4 @@ mod tests {
         assert_eq!(Seeding, f(AnnounceEvent::None, NumberOfBytes(0)));
         assert_eq!(Leeching, f(AnnounceEvent::None, NumberOfBytes(1)));
     }
-}
+}