address clippy lints inside bee-network

Alex6323 · Oct 6, 2020 · d110b14 · d110b14
1 parent 914847c
commit d110b14
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 16 deletions.
diff --git a/bee-network/examples/common/config.rs b/bee-network/examples/common/config.rs
@@ -45,9 +45,9 @@ impl ConfigBuilder {
         Config {
             binding_address: self
                 .binding_address
-                .unwrap_or(SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 1337)),
+                .unwrap_or_else(|| SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 1337)),
             peers: self.peers,
-            message: self.message.unwrap_or("hello".into()),
+            message: self.message.unwrap_or_else(|| "hello".into()),
         }
     }
 }

diff --git a/bee-network/examples/pingpong.rs b/bee-network/examples/pingpong.rs
@@ -120,7 +120,7 @@ impl Node {
 #[inline]
 async fn process_event(
     event: Event,
-    message: &String,
+    message: &str,
     network: &mut Network,
     endpoints: &mut HashSet<EndpointId>,
     handshakes: &mut HashMap<String, Vec<EndpointId>>,
@@ -159,7 +159,7 @@ async fn process_event(
                 let handshake = Utf8Message::from_bytes(&message);
                 info!("[pingpong] Received handshake '{}' ({})", handshake, epid);
 
-                let epids = handshakes.entry(handshake.to_string()).or_insert(Vec::new());
+                let epids = handshakes.entry(handshake.to_string()).or_insert_with(Vec::new);
                 if !epids.contains(&epid) {
                     epids.push(epid);
                 }

diff --git a/bee-network/src/endpoint/connect.rs b/bee-network/src/endpoint/connect.rs
@@ -67,7 +67,7 @@ impl ConnectedEndpointList {
         self.0
             .iter()
             .find(|(_, endpoint)| endpoint.duplicate_of.map_or(false, |other| other == epid))
-            .map_or(None, |(duplicate, _)| Some(*duplicate))
+            .map(|(duplicate, _)| *duplicate)
     }
 
     pub fn is_duplicate(&self, epid: EndpointId) -> bool {

diff --git a/bee-network/src/endpoint/contact.rs b/bee-network/src/endpoint/contact.rs
@@ -14,7 +14,6 @@ use crate::util::{self, Port, TransportProtocol};
 use super::{EndpointId, Error};
 
 use dashmap::{mapref::entry::Entry, DashMap};
-use url;
 
 use std::{
     fmt,
@@ -55,8 +54,7 @@ impl EndpointContactParams {
             let socket_address = &format!("{}:{}", domain_name_or_ip_address, port)[..];
             let last_socket_address = util::resolve_address(socket_address)
                 .await
-                .map_err(|_| Error::DnsFailure)?
-                .into();
+                .map_err(|_| Error::DnsFailure)?;
 
             Ok(Self {
                 domain_name_or_ip_address,
@@ -74,8 +72,7 @@ impl EndpointContactParams {
             let socket_address = &format!("{}:{}", self.domain_name_or_ip_address, self.port)[..];
             let socket_address = util::resolve_address(socket_address)
                 .await
-                .map_err(|_| Error::DnsFailure)?
-                .into();
+                .map_err(|_| Error::DnsFailure)?;
 
             self.last_socket_address = socket_address;
         }

diff --git a/bee-network/src/endpoint/worker.rs b/bee-network/src/endpoint/worker.rs
@@ -276,7 +276,7 @@ async fn add_endpoint(
     endpoint_contacts: &mut EndpointContactList,
     internal_event_sender: &mut EventSender,
 ) -> Result<bool, WorkerError> {
-    if let Ok(endpoint_params) = EndpointContactParams::from_url(url.clone()).await {
+    if let Ok(endpoint_params) = EndpointContactParams::from_url(url).await {
         // let epid = EndpointId::new();
         let epid = endpoint_params.create_epid();
 

diff --git a/bee-network/src/tcp/mod.rs b/bee-network/src/tcp/mod.rs
@@ -154,7 +154,7 @@ async fn process_stream_read(
     epid: EndpointId,
     num_read: usize,
     internal_event_sender: &mut EventSender,
-    buffer: &Vec<u8>,
+    buffer: &[u8],
 ) -> bool {
     if num_read == 0 {
         trace!("Stream dropped by peer (EOF).");

diff --git a/bee-network/src/tcp/server.rs b/bee-network/src/tcp/server.rs
@@ -44,7 +44,7 @@ impl TcpServer {
     ) -> Self {
         trace!("Starting TCP server...");
 
-        let tcp_listener = TcpListener::bind(binding_address.clone())
+        let tcp_listener = TcpListener::bind(binding_address)
             .await
             .expect("Error binding TCP server");
 
@@ -133,10 +133,9 @@ async fn process_stream(
             let internal_event_sender = internal_event_sender.clone();
             let epid = EndpointId::new(TransportProtocol::Tcp, connection.peer_address);
 
-            return Ok(spawn_reader_writer(connection, epid, internal_event_sender)
+            Ok(spawn_reader_writer(connection, epid, internal_event_sender)
                 .await
-                .map_err(|e| WorkerError(Box::new(e)))
-                .is_ok());
+                .is_ok())
         }
         Err(e) => {
             warn!("Accepting connection failed: {:?}.", e);