bittorrent_udp: improve code formatting and imports

bittorrent_udp/src/converters/common.rs

@@ -1,23 +1,23 @@
-use crate::types;
+use crate::types::AnnounceEvent;
 
 
 #[inline]
-pub fn event_from_i32(i: i32) -> types::AnnounceEvent {
+pub fn event_from_i32(i: i32) -> AnnounceEvent {
     match i {
-        1 => types::AnnounceEvent::Completed,
-        2 => types::AnnounceEvent::Started,
-        3 => types::AnnounceEvent::Stopped,
-        _ => types::AnnounceEvent::None
+        1 => AnnounceEvent::Completed,
+        2 => AnnounceEvent::Started,
+        3 => AnnounceEvent::Stopped,
+        _ => AnnounceEvent::None
     }
 }
 
 
 #[inline]
-pub fn event_to_i32(event: types::AnnounceEvent) -> i32 {
+pub fn event_to_i32(event: AnnounceEvent) -> i32 {
     match event {
-        types::AnnounceEvent::None => 0,
-        types::AnnounceEvent::Completed => 1,
-        types::AnnounceEvent::Started => 2,
-        types::AnnounceEvent::Stopped => 3
+        AnnounceEvent::None => 0,
+        AnnounceEvent::Completed => 1,
+        AnnounceEvent::Started => 2,
+        AnnounceEvent::Stopped => 3
     }
 }

bittorrent_udp/src/types/common.rs

@@ -1,5 +1,4 @@
-use std::net;
-
+use std::net::IpAddr;
 
 
 #[derive(PartialEq, Eq, Hash, Clone, Copy, Debug)]
@@ -45,8 +44,8 @@ pub struct PeerKey (pub u32);
 
 #[derive(Hash, PartialEq, Eq, Clone, Debug)]
 pub struct ResponsePeer {
-    pub ip_address:    net::IpAddr,
-    pub port:          Port,
+    pub ip_address: IpAddr,
+    pub port: Port,
 }
 
 

bittorrent_udp/src/types/request.rs

@@ -13,30 +13,30 @@ pub enum AnnounceEvent {
 
 #[derive(PartialEq, Eq, Clone, Debug)]
 pub struct ConnectRequest {
-    pub transaction_id:   TransactionId
+    pub transaction_id: TransactionId
 }
 
 #[derive(PartialEq, Eq, Clone, Debug)]
 pub struct AnnounceRequest {
-    pub connection_id:    ConnectionId,
-    pub transaction_id:   TransactionId,
-    pub info_hash:        InfoHash,
-    pub peer_id:          PeerId,
+    pub connection_id: ConnectionId,
+    pub transaction_id: TransactionId,
+    pub info_hash: InfoHash,
+    pub peer_id: PeerId,
     pub bytes_downloaded: NumberOfBytes,
-    pub bytes_uploaded:   NumberOfBytes,
-    pub bytes_left:       NumberOfBytes,
-    pub event:            AnnounceEvent,
-    pub ip_address:       Option<Ipv4Addr>, 
-    pub key:              PeerKey,
-    pub peers_wanted:     NumberOfPeers,
-    pub port:             Port
+    pub bytes_uploaded: NumberOfBytes,
+    pub bytes_left: NumberOfBytes,
+    pub event: AnnounceEvent,
+    pub ip_address: Option<Ipv4Addr>, 
+    pub key: PeerKey,
+    pub peers_wanted: NumberOfPeers,
+    pub port: Port
 }
 
 #[derive(PartialEq, Eq, Clone, Debug)]
 pub struct ScrapeRequest {
-    pub connection_id:    ConnectionId,
-    pub transaction_id:   TransactionId,
-    pub info_hashes:      Vec<InfoHash>
+    pub connection_id: ConnectionId,
+    pub transaction_id: TransactionId,
+    pub info_hashes: Vec<InfoHash>
 }
 
 

bittorrent_udp/src/types/response.rs

@@ -1,39 +1,38 @@
 use super::common::*;
 
 
-
 #[derive(PartialEq, Eq, Debug, Copy, Clone)]
 pub struct TorrentScrapeStatistics {
-    pub seeders:   NumberOfPeers,
+    pub seeders: NumberOfPeers,
     pub completed: NumberOfDownloads,
-    pub leechers:  NumberOfPeers
+    pub leechers: NumberOfPeers
 }
 
 #[derive(PartialEq, Eq, Clone, Debug)]
 pub struct ConnectResponse {
-    pub connection_id:     ConnectionId,
-    pub transaction_id:    TransactionId
+    pub connection_id: ConnectionId,
+    pub transaction_id: TransactionId
 }
 
 #[derive(PartialEq, Eq, Clone, Debug)]
 pub struct AnnounceResponse {
-    pub transaction_id:    TransactionId,
+    pub transaction_id: TransactionId,
     pub announce_interval: AnnounceInterval,
-    pub leechers:          NumberOfPeers,
-    pub seeders:           NumberOfPeers,
-    pub peers:             Vec<ResponsePeer>
+    pub leechers: NumberOfPeers,
+    pub seeders: NumberOfPeers,
+    pub peers: Vec<ResponsePeer>
 }
 
 #[derive(PartialEq, Eq, Clone, Debug)]
 pub struct ScrapeResponse {
-    pub transaction_id:    TransactionId,
-    pub torrent_stats:     Vec<TorrentScrapeStatistics>
+    pub transaction_id: TransactionId,
+    pub torrent_stats: Vec<TorrentScrapeStatistics>
 }
 
 #[derive(PartialEq, Eq, Clone, Debug)]
 pub struct ErrorResponse {
-    pub transaction_id:    TransactionId,
-    pub message:           String
+    pub transaction_id: TransactionId,
+    pub message: String
 }
 
 #[derive(PartialEq, Eq, Clone, Debug)]