enable and fix clippy style warnings

.cargo/config.toml

@@ -1,3 +1,3 @@
 [alias]
 # Temporary solution to have clippy config in a single place until https://github.com/rust-lang/rust-clippy/blob/master/doc/roadmap-2021.md#lintstoml-configuration is shipped.
-custom-clippy = "clippy -- -A clippy::type_complexity -A clippy::pedantic -A clippy::style -D warnings"
+custom-clippy = "clippy -- -A clippy::type_complexity -A clippy::pedantic -D warnings"

core/src/transport/memory.rs

@@ -150,9 +150,12 @@ impl Future for DialFuture {
             .take()
             .expect("Future should not be polled again once complete");
         let dial_port = self.dial_port;
-        match self.sender.start_send((channel_to_send, dial_port)) {
-            Err(_) => return Poll::Ready(Err(MemoryTransportError::Unreachable)),
-            Ok(()) => {}
+        if self
+            .sender
+            .start_send((channel_to_send, dial_port))
+            .is_err()
+        {
+            return Poll::Ready(Err(MemoryTransportError::Unreachable));
         }
 
         Poll::Ready(Ok(self

misc/metrics/src/gossipsub.rs

@@ -42,11 +42,8 @@ impl Metrics {
 
 impl super::Recorder<libp2p_gossipsub::GossipsubEvent> for super::Metrics {
     fn record(&self, event: &libp2p_gossipsub::GossipsubEvent) {
-        match event {
-            libp2p_gossipsub::GossipsubEvent::Message { .. } => {
-                self.gossipsub.messages.inc();
-            }
-            _ => {}
+        if let libp2p_gossipsub::GossipsubEvent::Message { .. } = event {
+            self.gossipsub.messages.inc();
         }
     }
 }

protocols/gossipsub/src/behaviour.rs

@@ -1226,19 +1226,19 @@ where
             }
 
             for id in ids {
-                if !self.duplicate_cache.contains(&id) && !self.pending_iwant_msgs.contains(&id) {
-                    if self
+                if !self.duplicate_cache.contains(&id)
+                    && !self.pending_iwant_msgs.contains(&id)
+                    && self
                         .peer_score
                         .as_ref()
                         .map(|(_, _, _, promises)| !promises.contains(&id))
                         .unwrap_or(true)
-                    {
-                        // have not seen this message and are not currently requesting it
-                        if iwant_ids.insert(id) {
-                            // Register the IWANT metric
-                            if let Some(metrics) = self.metrics.as_mut() {
-                                metrics.register_iwant(&topic);
-                            }
+                {
+                    // have not seen this message and are not currently requesting it
+                    if iwant_ids.insert(id) {
+                        // Register the IWANT metric
+                        if let Some(metrics) = self.metrics.as_mut() {
+                            metrics.register_iwant(&topic);
                         }
                     }
                 }
@@ -1353,7 +1353,7 @@ where
             } else if let Some(m) = self.metrics.as_mut() {
                 // Sending of messages succeeded, register them on the internal metrics.
                 for topic in topics.iter() {
-                    m.msg_sent(&topic, msg_bytes);
+                    m.msg_sent(topic, msg_bytes);
                 }
             }
         }
@@ -2136,7 +2136,7 @@ where
             for peer_id in self.connected_peers.keys() {
                 scores
                     .entry(peer_id)
-                    .or_insert_with(|| peer_score.metric_score(&peer_id, self.metrics.as_mut()));
+                    .or_insert_with(|| peer_score.metric_score(peer_id, self.metrics.as_mut()));
             }
         }
 

protocols/gossipsub/src/mcache.rs

@@ -148,7 +148,7 @@ impl MessageCache {
             message.validated = true;
             // Clear the known peers list (after a message is validated, it is forwarded and we no
             // longer need to store the originating peers).
-            let originating_peers = std::mem::replace(known_peers, HashSet::new());
+            let originating_peers = std::mem::take(known_peers);
             (&*message, originating_peers)
         })
     }

protocols/gossipsub/src/metrics.rs

@@ -517,9 +517,7 @@ impl Metrics {
         let metric = self
             .peers_per_protocol
             .get_or_create(&ProtocolLabel { protocol: kind });
-        if metric.get() == 0 {
-            return;
-        } else {
+        if metric.get() != 0 {
             // decrement the counter
             metric.set(metric.get() - 1);
         }

protocols/gossipsub/src/peer_score.rs

@@ -860,7 +860,7 @@ impl PeerScore {
                             //should always be true
                             let window_time = validated_time
                                 .checked_add(topic_params.mesh_message_deliveries_window)
-                                .unwrap_or_else(|| *now);
+                                .unwrap_or(*now);
                             if now > &window_time {
                                 falls_in_mesh_deliver_window = false;
                             }

protocols/identify/src/identify.rs

@@ -196,16 +196,14 @@ impl Identify {
         I: IntoIterator<Item = PeerId>,
     {
         for p in peers {
-            if self.pending_push.insert(p) {
-                if !self.connected.contains_key(&p) {
-                    let handler = self.new_handler();
-                    self.events.push_back(NetworkBehaviourAction::Dial {
-                        opts: DialOpts::peer_id(p)
-                            .condition(dial_opts::PeerCondition::Disconnected)
-                            .build(),
-                        handler,
-                    });
-                }
+            if self.pending_push.insert(p) && !self.connected.contains_key(&p) {
+                let handler = self.new_handler();
+                self.events.push_back(NetworkBehaviourAction::Dial {
+                    opts: DialOpts::peer_id(p)
+                        .condition(dial_opts::PeerCondition::Disconnected)
+                        .build(),
+                    handler,
+                });
             }
         }
     }
@@ -240,7 +238,7 @@ impl NetworkBehaviour for Identify {
         if let Some(entry) = self.discovered_peers.get_mut(peer_id) {
             for addr in failed_addresses
                 .into_iter()
-                .flat_map(|addresses| addresses.into_iter())
+                .flat_map(|addresses| addresses.iter())
             {
                 entry.remove(addr);
             }
@@ -451,7 +449,7 @@ impl NetworkBehaviour for Identify {
         self.discovered_peers
             .get(peer)
             .cloned()
-            .map(|addr| Vec::from_iter(addr))
+            .map(Vec::from_iter)
             .unwrap_or_default()
     }
 }
@@ -510,7 +508,7 @@ fn multiaddr_matches_peer_id(addr: &Multiaddr, peer_id: &PeerId) -> bool {
     if let Some(Protocol::P2p(multi_addr_peer_id)) = last_component {
         return multi_addr_peer_id == *peer_id.as_ref();
     }
-    return true;
+    true
 }
 
 #[cfg(test)]

protocols/kad/src/addresses.rs

@@ -65,6 +65,7 @@ impl Addresses {
     ///
     /// An address should only be removed if is determined to be invalid or
     /// otherwise unreachable.
+    #[allow(clippy::result_unit_err)]
     pub fn remove(&mut self, addr: &Multiaddr) -> Result<(), ()> {
         if self.addrs.len() == 1 {
             return Err(());

protocols/kad/src/behaviour.rs

@@ -1825,7 +1825,7 @@ where
         errors: Option<&Vec<Multiaddr>>,
         other_established: usize,
     ) {
-        for addr in errors.map(|a| a.into_iter()).into_iter().flatten() {
+        for addr in errors.map(|a| a.iter()).into_iter().flatten() {
             self.address_failed(*peer_id, addr);
         }
 

protocols/kad/src/jobs.rs

@@ -108,6 +108,7 @@ impl<T> PeriodicJob<T> {
 
     /// Returns `true` if the job is currently not running but ready
     /// to be run, `false` otherwise.
+    #[allow(clippy::wrong_self_convention)]
     fn is_ready(&mut self, cx: &mut Context<'_>, now: Instant) -> bool {
         if let PeriodicJobState::Waiting(delay, deadline) = &mut self.state {
             if now >= *deadline || !Future::poll(Pin::new(delay), cx).is_pending() {

protocols/kad/src/kbucket/bucket.rs

@@ -365,11 +365,11 @@ where
             // Adjust `first_connected_pos` accordingly.
             match status {
                 NodeStatus::Connected => {
-                    if self.first_connected_pos.map_or(false, |p| p == pos.0) {
-                        if pos.0 == self.nodes.len() {
-                            // It was the last connected node.
-                            self.first_connected_pos = None
-                        }
+                    if self.first_connected_pos.map_or(false, |p| p == pos.0)
+                        && pos.0 == self.nodes.len()
+                    {
+                        // It was the last connected node.
+                        self.first_connected_pos = None
                     }
                 }
                 NodeStatus::Disconnected => {

protocols/kad/src/kbucket/key.rs

@@ -86,9 +86,9 @@ impl<T> Key<T> {
     }
 }
 
-impl<T> Into<KeyBytes> for Key<T> {
-    fn into(self) -> KeyBytes {
-        self.bytes
+impl<T> From<Key<T>> for KeyBytes {
+    fn from(key: Key<T>) -> KeyBytes {
+        key.bytes
     }
 }
 

protocols/mdns/src/behaviour.rs

@@ -122,7 +122,7 @@ impl NetworkBehaviour for Mdns {
 
     fn inject_new_listen_addr(&mut self, _id: ListenerId, _addr: &Multiaddr) {
         log::trace!("waking interface state because listening address changed");
-        for (_, iface) in &mut self.iface_states {
+        for iface in self.iface_states.values_mut() {
             iface.fire_timer();
         }
     }
@@ -178,7 +178,7 @@ impl NetworkBehaviour for Mdns {
         }
         // Emit discovered event.
         let mut discovered = SmallVec::<[(PeerId, Multiaddr); 4]>::new();
-        for (_, iface_state) in &mut self.iface_states {
+        for iface_state in self.iface_states.values_mut() {
             while let Some((peer, addr, expiration)) = iface_state.poll(cx, params) {
                 if let Some((_, _, cur_expires)) = self
                     .discovered_nodes

protocols/ping/src/handler.rs

@@ -116,6 +116,12 @@ impl Config {
     }
 }
 
+impl Default for Config {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 /// The successful result of processing an inbound or outbound ping.
 #[derive(Debug)]
 pub enum Success {

protocols/relay/src/v2/client.rs

@@ -313,7 +313,7 @@ impl NetworkBehaviour for Client {
             ),
         };
 
-        return Poll::Ready(action);
+        Poll::Ready(action)
     }
 }
 

protocols/relay/src/v2/client/transport.rs

@@ -211,7 +211,7 @@ impl Transport for ClientTransport {
         // traversal. One would coordinate such traversal via a previously
         // established relayed connection, but never using a relayed connection
         // itself.
-        return Err(TransportError::MultiaddrNotSupported(addr));
+        Err(TransportError::MultiaddrNotSupported(addr))
     }
 
     fn address_translation(&self, _server: &Multiaddr, _observed: &Multiaddr) -> Option<Multiaddr> {
@@ -244,20 +244,20 @@ fn parse_relayed_multiaddr(
                 if before_circuit {
                     before_circuit = false;
                 } else {
-                    Err(RelayError::MultipleCircuitRelayProtocolsUnsupported)?;
+                    return Err(RelayError::MultipleCircuitRelayProtocolsUnsupported.into());
                 }
             }
             Protocol::P2p(hash) => {
                 let peer_id = PeerId::from_multihash(hash).map_err(|_| RelayError::InvalidHash)?;
 
                 if before_circuit {
                     if relayed_multiaddr.relay_peer_id.is_some() {
-                        Err(RelayError::MalformedMultiaddr)?;
+                        return Err(RelayError::MalformedMultiaddr.into());
                     }
                     relayed_multiaddr.relay_peer_id = Some(peer_id)
                 } else {
                     if relayed_multiaddr.dst_peer_id.is_some() {
-                        Err(RelayError::MalformedMultiaddr)?;
+                        return Err(RelayError::MalformedMultiaddr.into());
                     }
                     relayed_multiaddr.dst_peer_id = Some(peer_id)
                 }

protocols/relay/src/v2/protocol/inbound_hop.rs

@@ -86,7 +86,9 @@ impl upgrade::InboundUpgrade<NegotiatedSubstream> for Upgrade {
                         .map_err(|_| FatalUpgradeError::ParsePeerId)?;
                     Req::Connect(CircuitReq { dst, substream })
                 }
-                hop_message::Type::Status => Err(FatalUpgradeError::UnexpectedTypeStatus)?,
+                hop_message::Type::Status => {
+                    return Err(FatalUpgradeError::UnexpectedTypeStatus.into())
+                }
             };
 
             Ok(req)

protocols/relay/src/v2/protocol/inbound_stop.rs

@@ -78,7 +78,7 @@ impl upgrade::InboundUpgrade<NegotiatedSubstream> for Upgrade {
                         limit: limit.map(Into::into),
                     })
                 }
-                stop_message::Type::Status => Err(FatalUpgradeError::UnexpectedTypeStatus)?,
+                stop_message::Type::Status => Err(FatalUpgradeError::UnexpectedTypeStatus.into()),
             }
         }
         .boxed()

protocols/relay/src/v2/protocol/outbound_hop.rs

@@ -100,8 +100,12 @@ impl upgrade::OutboundUpgrade<NegotiatedSubstream> for Upgrade {
             let r#type =
                 hop_message::Type::from_i32(r#type).ok_or(FatalUpgradeError::ParseTypeField)?;
             match r#type {
-                hop_message::Type::Connect => Err(FatalUpgradeError::UnexpectedTypeConnect)?,
-                hop_message::Type::Reserve => Err(FatalUpgradeError::UnexpectedTypeReserve)?,
+                hop_message::Type::Connect => {
+                    return Err(FatalUpgradeError::UnexpectedTypeConnect.into())
+                }
+                hop_message::Type::Reserve => {
+                    return Err(FatalUpgradeError::UnexpectedTypeReserve.into())
+                }
                 hop_message::Type::Status => {}
             }
 
@@ -114,18 +118,20 @@ impl upgrade::OutboundUpgrade<NegotiatedSubstream> for Upgrade {
                 Upgrade::Reserve => {
                     match status {
                         Status::Ok => {}
-                        Status::ReservationRefused => Err(ReservationFailedReason::Refused)?,
+                        Status::ReservationRefused => {
+                            return Err(ReservationFailedReason::Refused.into())
+                        }
                         Status::ResourceLimitExceeded => {
-                            Err(ReservationFailedReason::ResourceLimitExceeded)?
+                            return Err(ReservationFailedReason::ResourceLimitExceeded.into())
                         }
-                        s => Err(FatalUpgradeError::UnexpectedStatus(s))?,
+                        s => return Err(FatalUpgradeError::UnexpectedStatus(s).into()),
                     }
 
                     let reservation =
                         reservation.ok_or(FatalUpgradeError::MissingReservationField)?;
 
                     if reservation.addrs.is_empty() {
-                        Err(FatalUpgradeError::NoAddressesInReservation)?;
+                        return Err(FatalUpgradeError::NoAddressesInReservation.into());
                     }
 
                     let addrs = reservation
@@ -161,12 +167,18 @@ impl upgrade::OutboundUpgrade<NegotiatedSubstream> for Upgrade {
                     match status {
                         Status::Ok => {}
                         Status::ResourceLimitExceeded => {
-                            Err(CircuitFailedReason::ResourceLimitExceeded)?
+                            return Err(CircuitFailedReason::ResourceLimitExceeded.into())
+                        }
+                        Status::ConnectionFailed => {
+                            return Err(CircuitFailedReason::ConnectionFailed.into())
+                        }
+                        Status::NoReservation => {
+                            return Err(CircuitFailedReason::NoReservation.into())
+                        }
+                        Status::PermissionDenied => {
+                            return Err(CircuitFailedReason::PermissionDenied.into())
                         }
-                        Status::ConnectionFailed => Err(CircuitFailedReason::ConnectionFailed)?,
-                        Status::NoReservation => Err(CircuitFailedReason::NoReservation)?,
-                        Status::PermissionDenied => Err(CircuitFailedReason::PermissionDenied)?,
-                        s => Err(FatalUpgradeError::UnexpectedStatus(s))?,
+                        s => return Err(FatalUpgradeError::UnexpectedStatus(s).into()),
                     }
 
                     let FramedParts {