fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-23 14:51:34 +00:00
Code Issues Projects Releases Wiki Activity

Fix some rustc/clippy warnings. (#895)

Browse Source
This commit is contained in:
Toralf Wittner
2019-01-30 15:41:54 +01:00
committed by GitHub
parent a77da73010
commit e23b2733e2
25 changed files with 63 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/either.rs
View File

@ -335,11 +335,11 @@ where
match self {
EitherFuture2::A(a) => a.poll()
.map(|v| v.map(EitherOutput::First))
.map_err(|e| EitherError::A(e)),
.map_err(EitherError::A),
EitherFuture2::B(b) => b.poll()
.map(|v| v.map(EitherOutput::Second))
.map_err(|e| EitherError::B(e))
.map_err(EitherError::B)
}
}
}

2
core/src/nodes/handled_node_tasks/tests.rs
View File

@ -90,7 +90,7 @@ impl NodeTaskTestBuilder {
}
};
let node_task = NodeTask {
inner: inner,
inner,
events_tx: events_from_node_task_tx.clone(), // events TO the outside
in_events_rx: events_to_node_task_rx.fuse(), // events FROM the outside
id: self.task_id,

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

@ -248,7 +248,7 @@ where
{
fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
match *self {
RawSwarmEvent::ListenerClosed { ref listen_addr, listener: _, ref result } => {
RawSwarmEvent::ListenerClosed { ref listen_addr, ref result, .. } => {
f.debug_struct("ListenerClosed")
.field("listen_addr", listen_addr)
.field("result", result)
@ -1327,7 +1327,7 @@ where
{
fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
match *self {
Peer::Connected( PeerConnected { peer: _, ref peer_id, ref connected_points }) => {
Peer::Connected( PeerConnected { ref peer_id, ref connected_points, .. }) => {
f.debug_struct("Connected")
.field("peer_id", peer_id)
.field("connected_points", connected_points)
@ -1371,7 +1371,7 @@ where
{
/// If we are connected, returns the `PeerConnected`.
#[inline]
pub fn as_connected(self) -> Option<PeerConnected<'a, TInEvent, TPeerId>> {
pub fn into_connected(self) -> Option<PeerConnected<'a, TInEvent, TPeerId>> {
match self {
Peer::Connected(peer) => Some(peer),
_ => None,
@ -1380,7 +1380,7 @@ where
/// If a connection is pending, returns the `PeerPendingConnect`.
#[inline]
pub fn as_pending_connect(self) -> Option<PeerPendingConnect<'a, TTrans, TInEvent, TOutEvent, THandler, THandlerErr, TPeerId>> {
pub fn into_pending_connect(self) -> Option<PeerPendingConnect<'a, TTrans, TInEvent, TOutEvent, THandler, THandlerErr, TPeerId>> {
match self {
Peer::PendingConnect(peer) => Some(peer),
_ => None,
@ -1389,7 +1389,7 @@ where
/// If we are not connected, returns the `PeerNotConnected`.
#[inline]
pub fn as_not_connected(self) -> Option<PeerNotConnected<'a, TTrans, TInEvent, TOutEvent, THandler, THandlerErr, TPeerId>> {
pub fn into_not_connected(self) -> Option<PeerNotConnected<'a, TTrans, TInEvent, TOutEvent, THandler, THandlerErr, TPeerId>> {
match self {
Peer::NotConnected(peer) => Some(peer),
_ => None,
@ -1464,7 +1464,7 @@ where
/// If we are connected, returns the `PeerConnected`.
#[inline]
pub fn as_connected(self) -> Option<PeerConnected<'a, TInEvent, TPeerId>> {
pub fn into_connected(self) -> Option<PeerConnected<'a, TInEvent, TPeerId>> {
match self {
PeerPotentialConnect::Connected(peer) => Some(peer),
_ => None,
@ -1473,7 +1473,7 @@ where
/// If a connection is pending, returns the `PeerPendingConnect`.
#[inline]
pub fn as_pending_connect(self) -> Option<PeerPendingConnect<'a, TTrans, TInEvent, TOutEvent, THandler, THandlerErr, TPeerId>> {
pub fn into_pending_connect(self) -> Option<PeerPendingConnect<'a, TTrans, TInEvent, TOutEvent, THandler, THandlerErr, TPeerId>> {
match self {
PeerPotentialConnect::PendingConnect(peer) => Some(peer),
_ => None,

12
core/src/nodes/raw_swarm/tests.rs
View File

@ -131,7 +131,7 @@ fn num_incoming_negotiated() {
swarm.listen_on("/memory".parse().unwrap()).unwrap();
// no incoming yet
assert_eq!(swarm.num_incoming_negotiated(), 0);
assert_eq!(swarm.incoming_negotiated().count(), 0);
let mut rt = Runtime::new().unwrap();
let swarm = Arc::new(Mutex::new(swarm));
@ -147,7 +147,7 @@ fn num_incoming_negotiated() {
rt.block_on(fut).expect("tokio works");
let swarm = swarm.lock();
// Now there's an incoming connection
assert_eq!(swarm.num_incoming_negotiated(), 1);
assert_eq!(swarm.incoming_negotiated().count(), 1);
}
#[test]
@ -204,7 +204,7 @@ fn querying_for_pending_peer() {
let peer = swarm.peer(peer_id.clone());
assert_matches!(peer, Peer::NotConnected(PeerNotConnected{ .. }));
let addr = "/memory".parse().expect("bad multiaddr");
let pending_peer = peer.as_not_connected().unwrap().connect(addr, Handler::default());
let pending_peer = peer.into_not_connected().unwrap().connect(addr, Handler::default());
assert_matches!(pending_peer, PeerPendingConnect { .. });
}
@ -312,7 +312,7 @@ fn known_peer_that_is_unreachable_yields_dial_error() {
let peer = swarm1.peer(peer_id.clone());
assert_matches!(peer, Peer::NotConnected(PeerNotConnected{ .. }));
let addr = "/memory".parse::<Multiaddr>().expect("bad multiaddr");
let pending_peer = peer.as_not_connected().unwrap().connect(addr, Handler::default());
let pending_peer = peer.into_not_connected().unwrap().connect(addr, Handler::default());
assert_matches!(pending_peer, PeerPendingConnect { .. });
}
let mut rt = Runtime::new().unwrap();
@ -354,7 +354,7 @@ fn yields_node_error_when_there_is_an_error_after_successful_connect() {
let mut handler = Handler::default();
// Force an error
handler.next_states = vec![ HandlerState::Err ];
peer.as_not_connected().unwrap().connect(addr, handler);
peer.into_not_connected().unwrap().connect(addr, handler);
}
// Ensure we run on a single thread
@ -408,7 +408,7 @@ fn yields_node_closed_when_the_node_closes_after_successful_connect() {
let mut handler = Handler::default();
// Force handler to close
handler.next_states = vec![ HandlerState::Ready(None) ];
peer.as_not_connected().unwrap().connect(addr, handler);
peer.into_not_connected().unwrap().connect(addr, handler);
}
// Ensure we run on a single thread

4
core/src/swarm.rs
View File

@ -181,7 +181,7 @@ where TBehaviour: NetworkBehaviour,
pub fn dial(me: &mut Self, peer_id: PeerId) {
let addrs = me.behaviour.addresses_of_peer(&peer_id);
let handler = me.behaviour.new_handler().into_node_handler_builder();
if let Some(peer) = me.raw_swarm.peer(peer_id).as_not_connected() {
if let Some(peer) = me.raw_swarm.peer(peer_id).into_not_connected() {
let _ = peer.connect_iter(addrs, handler);
}
}
@ -294,7 +294,7 @@ where TBehaviour: NetworkBehaviour,
Swarm::dial(self, peer_id)
},
Async::Ready(NetworkBehaviourAction::SendEvent { peer_id, event }) => {
if let Some(mut peer) = self.raw_swarm.peer(peer_id).as_connected() {
if let Some(mut peer) = self.raw_swarm.peer(peer_id).into_connected() {
peer.send_event(event);
}
},

4
core/src/transport/map_err.rs
View File

@ -58,7 +58,7 @@ where
let stream = MapErrListener { inner: stream, map };
Ok((stream, listen_addr))
}
Err(err) => Err(err.map(move |err| map(err))),
Err(err) => Err(err.map(map)),
}
}
@ -67,7 +67,7 @@ where
match self.transport.dial(addr) {
Ok(future) => Ok(MapErrDial { inner: future, map: Some(map) }),
Err(err) => Err(err.map(move |err| map(err))),
Err(err) => Err(err.map(map)),
}
}

2
core/src/upgrade/error.rs
View File

@ -41,7 +41,7 @@ impl<E> UpgradeError<E> {
}
}
pub fn from_err<T>(self) -> UpgradeError<T>
pub fn into_err<T>(self) -> UpgradeError<T>
where
T: From<E>
{