style: apply cargo fmt

src/lib.rs

@@ -1382,7 +1382,7 @@ impl<TRepoTypes: RepoTypes> Future for IpfsFuture<TRepoTypes> {
  // off the events from Ipfs and ... this looping goes on for a while.
  done = false;
  match inner {
- Some(SwarmEvent::NewListenAddr{address, ..}) => {
+ Some(SwarmEvent::NewListenAddr { address, .. }) => {
  self.complete_listening_address_adding(address);
  }
  _ => trace!("{:?}", inner),

src/p2p/addr.rs

@@ -232,9 +232,9 @@ pub(crate) fn eq_greedy(addr0: &Multiaddr, addr1: &Multiaddr) -> bool {
  return true;
  }
  }
- 
+
  true
- },
+ }
  _ => false,
  }
 }
@@ -329,15 +329,36 @@ mod tests {
  #[test]
  fn greedy_multiaddr_comparison() {
  assert!(eq_greedy(&Multiaddr::empty(), &Multiaddr::empty()));
- assert!(eq_greedy(&build_multiaddr!(Ip4([192, 168, 0, 1])), &build_multiaddr!(Ip4([192, 168, 0, 1]))));
- assert!(eq_greedy(&build_multiaddr!(Ip4([192, 168, 0, 1]), Tcp(44444u16)), &build_multiaddr!(Ip4([192, 168, 0, 1]))));
- assert!(eq_greedy(&build_multiaddr!(Ip4([192, 168, 0, 1])), &build_multiaddr!(Ip4([192, 168, 0, 1]), Tcp(44444u16))));
+ assert!(eq_greedy(
+ &build_multiaddr!(Ip4([192, 168, 0, 1])),
+ &build_multiaddr!(Ip4([192, 168, 0, 1]))
+ ));
+ assert!(eq_greedy(
+ &build_multiaddr!(Ip4([192, 168, 0, 1]), Tcp(44444u16)),
+ &build_multiaddr!(Ip4([192, 168, 0, 1]))
+ ));
+ assert!(eq_greedy(
+ &build_multiaddr!(Ip4([192, 168, 0, 1])),
+ &build_multiaddr!(Ip4([192, 168, 0, 1]), Tcp(44444u16))
+ ));
 
  // At least one protocol segment needs to be there
- assert!(!eq_greedy(&Multiaddr::empty(), &build_multiaddr!(Ip4([192, 168, 0, 1]))));
- assert!(!eq_greedy(&build_multiaddr!(Ip4([192, 168, 0, 1])), &Multiaddr::empty()));
-
- assert!(!eq_greedy(&build_multiaddr!(Ip4([192, 168, 0, 1]), Tcp(44444u16)), &build_multiaddr!(Ip4([192, 168, 0, 2]))));
- assert!(!eq_greedy(&build_multiaddr!(Ip4([192, 168, 0, 2])), &build_multiaddr!(Ip4([192, 168, 0, 1]), Tcp(44444u16))));
+ assert!(!eq_greedy(
+ &Multiaddr::empty(),
+ &build_multiaddr!(Ip4([192, 168, 0, 1]))
+ ));
+ assert!(!eq_greedy(
+ &build_multiaddr!(Ip4([192, 168, 0, 1])),
+ &Multiaddr::empty()
+ ));
+
+ assert!(!eq_greedy(
+ &build_multiaddr!(Ip4([192, 168, 0, 1]), Tcp(44444u16)),
+ &build_multiaddr!(Ip4([192, 168, 0, 2]))
+ ));
+ assert!(!eq_greedy(
+ &build_multiaddr!(Ip4([192, 168, 0, 2])),
+ &build_multiaddr!(Ip4([192, 168, 0, 1]), Tcp(44444u16))
+ ));
  }
 }

src/p2p/behaviour.rs

@@ -84,7 +84,7 @@ impl<Types: IpfsTypes> NetworkBehaviourEventProcess<KademliaEvent> for Behaviour
  };
 
  match event {
- InboundRequestServed { request, } => {
+ InboundRequestServed { request } => {
  trace!("kad: inbound {:?} request handled", request);
  }
  OutboundQueryCompleted { result, id, .. } => {

src/p2p/pubsub.rs

@@ -431,7 +431,10 @@ impl NetworkBehaviour for Pubsub {
  score,
  });
  }
- NetworkBehaviourAction::CloseConnection { peer_id, connection } => {
+ NetworkBehaviourAction::CloseConnection {
+ peer_id,
+ connection,
+ } => {
  return Poll::Ready(NetworkBehaviourAction::CloseConnection {
  peer_id,
  connection,

src/p2p/swarm.rs

@@ -416,8 +416,13 @@ impl NetworkBehaviour for SwarmApi {
 
 fn connection_point_addr(cp: &ConnectedPoint) -> MultiaddrWithoutPeerId {
  match cp {
- ConnectedPoint::Dialer { address } => MultiaddrWithPeerId::try_from(address.to_owned()).expect("dialed address contains peerid in libp2p 0.38").into(),
- ConnectedPoint::Listener { send_back_addr, .. } => send_back_addr.to_owned().try_into().expect("send back address does not contain peerid in libp2p 0.38"),
+ ConnectedPoint::Dialer { address } => MultiaddrWithPeerId::try_from(address.to_owned())
+ .expect("dialed address contains peerid in libp2p 0.38")
+ .into(),
+ ConnectedPoint::Listener { send_back_addr, .. } => send_back_addr
+ .to_owned()
+ .try_into()
+ .expect("send back address does not contain peerid in libp2p 0.38"),
  }
 }
 
@@ -442,7 +447,7 @@ mod tests {
  Swarm::listen_on(&mut swarm1, "/ip4/127.0.0.1/tcp/0".parse().unwrap()).unwrap();
 
  loop {
- if let Some(SwarmEvent::NewListenAddr{..}) = swarm1.next().await {
+ if let Some(SwarmEvent::NewListenAddr { .. }) = swarm1.next().await {
  break;
  }
  }
@@ -502,7 +507,7 @@ mod tests {
  let addr;
 
  loop {
- if let Some(SwarmEvent::NewListenAddr {address, ..}) = swarm1.next().await {
+ if let Some(SwarmEvent::NewListenAddr { address, .. }) = swarm1.next().await {
  // wonder if there should be a timeout?
  addr = address;
  break;
@@ -543,7 +548,7 @@ mod tests {
  let mut addr = Vec::with_capacity(2);
 
  while addr.len() < 2 {
- if let Some(SwarmEvent::NewListenAddr {address, ..}) = swarm1.next().await {
+ if let Some(SwarmEvent::NewListenAddr { address, .. }) = swarm1.next().await {
  addr.push(address);
  }
  }