diff --git a/core/src/nodes/collection.rs b/core/src/nodes/collection.rs index 97c880eb..aadd25a4 100644 --- a/core/src/nodes/collection.rs +++ b/core/src/nodes/collection.rs @@ -297,8 +297,8 @@ impl CollectionStream Err(()), Entry::Occupied(entry) => { match entry.get() { - &TaskState::Connected(_) => return Err(()), - &TaskState::Pending => (), + TaskState::Connected(_) => return Err(()), + TaskState::Pending => (), }; entry.remove(); diff --git a/core/src/nodes/handled_node_tasks.rs b/core/src/nodes/handled_node_tasks.rs index 9cd7e69f..272ded2a 100644 --- a/core/src/nodes/handled_node_tasks.rs +++ b/core/src/nodes/handled_node_tasks.rs @@ -183,7 +183,7 @@ impl HandledNodesTasks Option> { - match self.tasks.entry(id.clone()) { + match self.tasks.entry(id) { Entry::Occupied(inner) => Some(Task { inner }), Entry::Vacant(_) => None, } @@ -378,7 +378,7 @@ where for event in events_buffer { node.inject_event(event); } - if let Err(_) = self.events_tx.unbounded_send((event, self.id)) { + if self.events_tx.unbounded_send((event, self.id)).is_err() { node.shutdown(); } self.inner = NodeTaskInner::Node(node); @@ -425,7 +425,7 @@ where }, Ok(Async::Ready(Some(event))) => { let event = InToExtMessage::NodeEvent(event); - if let Err(_) = self.events_tx.unbounded_send((event, self.id)) { + if self.events_tx.unbounded_send((event, self.id)).is_err() { node.shutdown(); } } diff --git a/core/src/nodes/raw_swarm.rs b/core/src/nodes/raw_swarm.rs index 6498c758..3e2261a3 100644 --- a/core/src/nodes/raw_swarm.rs +++ b/core/src/nodes/raw_swarm.rs @@ -1036,7 +1036,7 @@ impl<'a, TInEvent, TOutEvent, THandler> PeerPendingConnect<'a, TInEvent, TOutEve #[inline] pub fn interrupt(self) { let attempt = self.attempt.remove(); - if let Err(_) = self.active_nodes.interrupt(attempt.id) { + if self.active_nodes.interrupt(attempt.id).is_err() { // TODO: improve proof or remove; this is too complicated right now panic!("We retreived this attempt.id from out_reach_attempts. We insert in \ out_reach_attempts only at the same time as we call add_reach_attempt. \ diff --git a/core/src/transport/and_then.rs b/core/src/transport/and_then.rs index 461448a5..d6bc2517 100644 --- a/core/src/transport/and_then.rs +++ b/core/src/transport/and_then.rs @@ -57,10 +57,10 @@ where let (listening_stream, new_addr) = match self.transport.listen_on(addr) { Ok((l, new_addr)) => (l, new_addr), - Err((trans, addr)) => { + Err((transport, addr)) => { let builder = AndThen { - transport: trans, - upgrade: upgrade, + transport, + upgrade, }; return Err((builder, addr)); @@ -96,10 +96,10 @@ where let dialed_fut = match self.transport.dial(addr.clone()) { Ok(f) => f, - Err((trans, addr)) => { + Err((transport, addr)) => { let builder = AndThen { - transport: trans, - upgrade: upgrade, + transport, + upgrade, }; return Err((builder, addr));