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

chore: Implement latest clippy warnings (#3220)

Browse Source 
As I do frequently, I corrected for the latest clippy warnings. This will make sure the CI won't complain in the future. We could automate this btw and maybe run the nightly version of clippy.
This commit is contained in:
Hannes
2022-12-14 16:45:04 +01:00
committed by GitHub
parent be3ec6c62b
commit d79c93abdb
72 changed files with 244 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
swarm/src/connection/error.rs
View File

@ -43,11 +43,11 @@ where
{
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
ConnectionError::IO(err) => write!(f, "Connection error: I/O error: {}", err),
ConnectionError::IO(err) => write!(f, "Connection error: I/O error: {err}"),
ConnectionError::KeepAliveTimeout => {
write!(f, "Connection closed due to expired keep-alive timeout.")
}
ConnectionError::Handler(err) => write!(f, "Connection error: Handler error: {}", err),
ConnectionError::Handler(err) => write!(f, "Connection error: Handler error: {err}"),
}
}
}
@ -130,23 +130,21 @@ where
{
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
PendingConnectionError::IO(err) => write!(f, "Pending connection: I/O error: {}", err),
PendingConnectionError::IO(err) => write!(f, "Pending connection: I/O error: {err}"),
PendingConnectionError::Aborted => write!(f, "Pending connection: Aborted."),
PendingConnectionError::Transport(err) => {
write!(
f,
"Pending connection: Transport error on connection: {}",
err
"Pending connection: Transport error on connection: {err}"
)
}
PendingConnectionError::ConnectionLimit(l) => {
write!(f, "Connection error: Connection limit: {}.", l)
write!(f, "Connection error: Connection limit: {l}.")
}
PendingConnectionError::WrongPeerId { obtained, endpoint } => {
write!(
f,
"Pending connection: Unexpected peer ID {} at {:?}.",
obtained, endpoint
"Pending connection: Unexpected peer ID {obtained} at {endpoint:?}."
)
}
}

2
swarm/src/handler.rs
View File

@ -564,7 +564,7 @@ where
ConnectionHandlerUpgrErr::Timer => {
write!(f, "Timer error while opening a substream")
}
ConnectionHandlerUpgrErr::Upgrade(err) => write!(f, "{}", err),
ConnectionHandlerUpgrErr::Upgrade(err) => write!(f, "{err}"),
}
}
}

2
swarm/src/handler/multi.rs
View File

@ -560,7 +560,7 @@ impl DuplicateProtonameError {
impl fmt::Display for DuplicateProtonameError {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
if let Ok(s) = std::str::from_utf8(&self.0) {
write!(f, "duplicate protocol name: {}", s)
write!(f, "duplicate protocol name: {s}")
} else {
write!(f, "duplicate protocol name: {:?}", self.0)
}

38
swarm/src/lib.rs
View File

@ -1658,33 +1658,27 @@ impl From<PendingOutboundConnectionError<io::Error>> for DialError {
impl fmt::Display for DialError {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
DialError::ConnectionLimit(err) => write!(f, "Dial error: {}", err),
DialError::ConnectionLimit(err) => write!(f, "Dial error: {err}"),
DialError::NoAddresses => write!(f, "Dial error: no addresses for peer."),
DialError::LocalPeerId => write!(f, "Dial error: tried to dial local peer id."),
DialError::Banned => write!(f, "Dial error: peer is banned."),
DialError::DialPeerConditionFalse(c) => {
write!(
f,
"Dial error: condition {:?} for dialing peer was false.",
c
)
write!(f, "Dial error: condition {c:?} for dialing peer was false.")
}
DialError::Aborted => write!(
f,
"Dial error: Pending connection attempt has been aborted."
),
DialError::InvalidPeerId(multihash) => {
write!(f, "Dial error: multihash {:?} is not a PeerId", multihash)
write!(f, "Dial error: multihash {multihash:?} is not a PeerId")
}
DialError::WrongPeerId { obtained, endpoint } => write!(
f,
"Dial error: Unexpected peer ID {} at {:?}.",
obtained, endpoint
"Dial error: Unexpected peer ID {obtained} at {endpoint:?}."
),
DialError::ConnectionIo(e) => write!(
f,
"Dial error: An I/O error occurred on the connection: {:?}.",
e
"Dial error: An I/O error occurred on the connection: {e:?}."
),
DialError::Transport(errors) => {
write!(f, "Failed to negotiate transport protocol(s): [")?;
@ -2263,7 +2257,7 @@ mod tests {
panic!("Unexpected transport event.")
}
Either::Right((e, _)) => {
panic!("Expect swarm to not emit any event {:?}", e)
panic!("Expect swarm to not emit any event {e:?}")
}
}
}
@ -2271,7 +2265,7 @@ mod tests {
match swarm.next().await.unwrap() {
SwarmEvent::OutgoingConnectionError { .. } => {}
e => panic!("Unexpected swarm event {:?}", e),
e => panic!("Unexpected swarm event {e:?}"),
}
})
}
@ -2311,7 +2305,7 @@ mod tests {
assert_eq!(limit.current, outgoing_limit);
assert_eq!(limit.limit, outgoing_limit);
}
e => panic!("Unexpected error: {:?}", e),
e => panic!("Unexpected error: {e:?}"),
}
let info = network.network_info();
@ -2351,7 +2345,7 @@ mod tests {
let listen_addr = async_std::task::block_on(poll_fn(|cx| {
match ready!(network1.poll_next_unpin(cx)).unwrap() {
SwarmEvent::NewListenAddr { address, .. } => Poll::Ready(address),
e => panic!("Unexpected network event: {:?}", e),
e => panic!("Unexpected network event: {e:?}"),
}
}));
@ -2390,7 +2384,7 @@ mod tests {
Poll::Pending => {
network_1_pending = true;
}
e => panic!("Unexpected network event: {:?}", e),
e => panic!("Unexpected network event: {e:?}"),
}
match network2.poll_next_unpin(cx) {
@ -2408,7 +2402,7 @@ mod tests {
Poll::Pending => {
network_2_pending = true;
}
e => panic!("Unexpected network event: {:?}", e),
e => panic!("Unexpected network event: {e:?}"),
}
if network_1_pending && network_2_pending {
@ -2478,7 +2472,7 @@ mod tests {
Poll::Ready(Some(SwarmEvent::OutgoingConnectionError {
peer_id, error, ..
})) => Poll::Ready((peer_id, error)),
Poll::Ready(x) => panic!("unexpected {:?}", x),
Poll::Ready(x) => panic!("unexpected {x:?}"),
Poll::Pending => Poll::Pending,
}
}));
@ -2494,7 +2488,7 @@ mod tests {
}
);
}
x => panic!("wrong error {:?}", x),
x => panic!("wrong error {x:?}"),
}
}
@ -2555,7 +2549,7 @@ mod tests {
assert_eq!(local_addr, local_address);
}
Poll::Ready(ev) => {
panic!("Unexpected event: {:?}", ev)
panic!("Unexpected event: {ev:?}")
}
Poll::Pending => break Poll::Pending,
}
@ -2631,7 +2625,7 @@ mod tests {
listener.listen_on(multiaddr![Memory(0u64)]).unwrap();
let listener_address = match block_on(listener.next()).unwrap() {
SwarmEvent::NewListenAddr { address, .. } => address,
e => panic!("Unexpected network event: {:?}", e),
e => panic!("Unexpected network event: {e:?}"),
};
dialer
@ -2651,7 +2645,7 @@ mod tests {
error: DialError::Aborted,
..
} => {}
e => panic!("Unexpected swarm event {:?}.", e),
e => panic!("Unexpected swarm event {e:?}."),
}
}