Fix clippy errors

src/ipmode.rs

@@ -53,13 +53,8 @@ impl IpMode {
         /// it simplifies the logic of matching socket_addr verification. For this we prevent
         /// communications with Ipv4 addresses advertised in the Ipv6 field.
         fn canonical_ipv6_enr_addr(enr: &Enr) -> Option<std::net::SocketAddrV6> {
-            enr.udp6_socket().and_then(|socket_addr| {
-                if to_ipv4_mapped(socket_addr.ip()).is_some() {
-                    None
-                } else {
-                    Some(socket_addr)
-                }
-            })
+            enr.udp6_socket()
+                .filter(|socket_addr| !to_ipv4_mapped(socket_addr.ip()).is_some())
         }
 
         match self {

src/kbucket.rs

@@ -850,21 +850,18 @@ where
                     None => self.iter = None,
                 },
                 None => {
-                    if let Some(i) = self.buckets_iter.next() {
-                        let bucket = &mut self.table.buckets[i.get()];
-                        if let Some(applied) = bucket.apply_pending() {
-                            self.table.applied_pending.push_back(applied)
-                        }
-                        let mut v = (self.fmap)(bucket);
-                        v.sort_by(|a, b| {
-                            self.target
-                                .distance(a.as_ref())
-                                .cmp(&self.target.distance(b.as_ref()))
-                        });
-                        self.iter = Some(v.into_iter());
-                    } else {
-                        return None;
+                    let i = self.buckets_iter.next()?;
+                    let bucket = &mut self.table.buckets[i.get()];
+                    if let Some(applied) = bucket.apply_pending() {
+                        self.table.applied_pending.push_back(applied)
                     }
+                    let mut v = (self.fmap)(bucket);
+                    v.sort_by(|a, b| {
+                        self.target
+                            .distance(a.as_ref())
+                            .cmp(&self.target.distance(b.as_ref()))
+                    });
+                    self.iter = Some(v.into_iter());
                 }
             }
         }

src/kbucket/bucket.rs

@@ -689,7 +689,7 @@ where
                 Some(fcp - 1)
             } else {
                 // FCP is unchanged, unless there are no nodes following the removed node.
-                Some(fcp).filter(|_| fcp < self.nodes.len())
+                (fcp < self.nodes.len()).then_some(fcp)
             }
         });
     }

src/service.rs

@@ -912,13 +912,8 @@ impl Service {
                     ip_votes.insert(node_id, socket);
                     let maybe_ip4_majority = ip_votes.majority().0;
 
-                    let new_ip4 = maybe_ip4_majority.and_then(|majority| {
-                        if Some(majority) != local_ip4_socket {
-                            Some(majority)
-                        } else {
-                            None
-                        }
-                    });
+                    let new_ip4 =
+                        maybe_ip4_majority.filter(|&majority| Some(majority) != local_ip4_socket);
 
                     // If we have a new ipv4 majority
                     if let Some(new_ip4) = new_ip4 {
@@ -947,13 +942,8 @@ impl Service {
                     ip_votes.insert(node_id, socket);
                     let maybe_ip6_majority = ip_votes.majority().1;
 
-                    let new_ip6 = maybe_ip6_majority.and_then(|majority| {
-                        if Some(majority) != local_ip6_socket {
-                            Some(majority)
-                        } else {
-                            None
-                        }
-                    });
+                    let new_ip6 =
+                        maybe_ip6_majority.filter(|&majority| Some(majority) != local_ip6_socket);
                     // Check if our advertised IPV6 address needs to be updated.
                     if let Some(new_ip6) = new_ip6 {
                         let new_ip6: SocketAddr = new_ip6.into();