fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-26 16:21:39 +00:00
Code Issues Projects Releases Wiki Activity

Some minor fixes reported by clippy (#600)

Browse Source
This commit is contained in:
Pierre Krieger
2018-11-02 13:15:17 +01:00
committed by GitHub
parent 9d91217193
commit 9249e31218
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/nodes/collection.rs
View File

@ -297,8 +297,8 @@ impl<TInEvent, TOutEvent, THandler> CollectionStream<TInEvent, TOutEvent, THandl
Entry::Vacant(_) => Err(()),
Entry::Occupied(entry) => {
match entry.get() {
&TaskState::Connected(_) => return Err(()),
&TaskState::Pending => (),
TaskState::Connected(_) => return Err(()),
TaskState::Pending => (),
};
entry.remove();

6
core/src/nodes/handled_node_tasks.rs
View File

@ -183,7 +183,7 @@ impl<TInEvent, TOutEvent, THandler> HandledNodesTasks<TInEvent, TOutEvent, THand
/// Returns `None` if the task id is invalid.
#[inline]
pub fn task(&mut self, id: TaskId) -> Option<Task<TInEvent>> {
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();
}
}

2
core/src/nodes/raw_swarm.rs
View File

@ -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. \

12
core/src/transport/and_then.rs
View File

@ -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));