feat(ci): lint against usages of variables with underscore

Prefixing a variable with an underscore (`_`) in Rust indicates that it is not used. Through refactorings, it can sometimes happen that we do end up using such a variable. In this case, the underscore should be removed.

Clippy can help us with this.

Pull-Request: #3484.
This commit is contained in:
Thomas Eizinger
2023-02-24 19:34:59 +11:00
committed by GitHub
parent 6383e1e8bd
commit d80d92dc45
10 changed files with 90 additions and 65 deletions

View File

@ -48,20 +48,20 @@ where
fn handle_established_inbound_connection(
&mut self,
_connection_id: ConnectionId,
connection_id: ConnectionId,
peer: PeerId,
local_addr: &Multiaddr,
remote_addr: &Multiaddr,
) -> Result<THandler<Self>, ConnectionDenied> {
let handler = match self {
Either::Left(inner) => Either::Left(inner.handle_established_inbound_connection(
_connection_id,
connection_id,
peer,
local_addr,
remote_addr,
)?),
Either::Right(inner) => Either::Right(inner.handle_established_inbound_connection(
_connection_id,
connection_id,
peer,
local_addr,
remote_addr,
@ -73,23 +73,23 @@ where
fn handle_pending_outbound_connection(
&mut self,
_connection_id: ConnectionId,
connection_id: ConnectionId,
maybe_peer: Option<PeerId>,
_addresses: &[Multiaddr],
_effective_role: Endpoint,
addresses: &[Multiaddr],
effective_role: Endpoint,
) -> Result<Vec<Multiaddr>, ConnectionDenied> {
let addresses = match self {
Either::Left(inner) => inner.handle_pending_outbound_connection(
_connection_id,
connection_id,
maybe_peer,
_addresses,
_effective_role,
addresses,
effective_role,
)?,
Either::Right(inner) => inner.handle_pending_outbound_connection(
_connection_id,
connection_id,
maybe_peer,
_addresses,
_effective_role,
addresses,
effective_role,
)?,
};
@ -98,20 +98,20 @@ where
fn handle_established_outbound_connection(
&mut self,
_connection_id: ConnectionId,
connection_id: ConnectionId,
peer: PeerId,
addr: &Multiaddr,
role_override: Endpoint,
) -> Result<THandler<Self>, ConnectionDenied> {
let handler = match self {
Either::Left(inner) => Either::Left(inner.handle_established_outbound_connection(
_connection_id,
connection_id,
peer,
addr,
role_override,
)?),
Either::Right(inner) => Either::Right(inner.handle_established_outbound_connection(
_connection_id,
connection_id,
peer,
addr,
role_override,

View File

@ -90,7 +90,7 @@ where
fn handle_established_inbound_connection(
&mut self,
_connection_id: ConnectionId,
connection_id: ConnectionId,
peer: PeerId,
local_addr: &Multiaddr,
remote_addr: &Multiaddr,
@ -101,7 +101,7 @@ where
};
let handler = inner.handle_established_inbound_connection(
_connection_id,
connection_id,
peer,
local_addr,
remote_addr,
@ -114,10 +114,10 @@ where
fn handle_pending_outbound_connection(
&mut self,
_connection_id: ConnectionId,
connection_id: ConnectionId,
maybe_peer: Option<PeerId>,
_addresses: &[Multiaddr],
_effective_role: Endpoint,
addresses: &[Multiaddr],
effective_role: Endpoint,
) -> Result<Vec<Multiaddr>, ConnectionDenied> {
let inner = match self.inner.as_mut() {
None => return Ok(vec![]),
@ -125,10 +125,10 @@ where
};
let addresses = inner.handle_pending_outbound_connection(
_connection_id,
connection_id,
maybe_peer,
_addresses,
_effective_role,
addresses,
effective_role,
)?;
Ok(addresses)
@ -136,7 +136,7 @@ where
fn handle_established_outbound_connection(
&mut self,
_connection_id: ConnectionId,
connection_id: ConnectionId,
peer: PeerId,
addr: &Multiaddr,
role_override: Endpoint,
@ -147,7 +147,7 @@ where
};
let handler = inner.handle_established_outbound_connection(
_connection_id,
connection_id,
peer,
addr,
role_override,

View File

@ -92,7 +92,7 @@ impl ConnectionHandler for PendingConnectionHandler {
info: _info,
}) => {
void::unreachable(protocol);
#[allow(unreachable_code)]
#[allow(unreachable_code, clippy::used_underscore_binding)]
{
void::unreachable(_info);
}

View File

@ -420,19 +420,19 @@ where
fn handle_established_inbound_connection(
&mut self,
_connection_id: ConnectionId,
connection_id: ConnectionId,
peer: PeerId,
local_addr: &Multiaddr,
remote_addr: &Multiaddr,
) -> Result<THandler<Self>, ConnectionDenied> {
self.handle_established_inbound_connection.push((
peer,
_connection_id,
connection_id,
local_addr.clone(),
remote_addr.clone(),
));
self.inner.handle_established_inbound_connection(
_connection_id,
connection_id,
peer,
local_addr,
remote_addr,
@ -441,28 +441,28 @@ where
fn handle_pending_outbound_connection(
&mut self,
_connection_id: ConnectionId,
connection_id: ConnectionId,
maybe_peer: Option<PeerId>,
_addresses: &[Multiaddr],
_effective_role: Endpoint,
addresses: &[Multiaddr],
effective_role: Endpoint,
) -> Result<Vec<Multiaddr>, ConnectionDenied> {
self.handle_pending_outbound_connection.push((
maybe_peer,
_addresses.to_vec(),
_effective_role,
_connection_id,
addresses.to_vec(),
effective_role,
connection_id,
));
self.inner.handle_pending_outbound_connection(
_connection_id,
connection_id,
maybe_peer,
_addresses,
_effective_role,
addresses,
effective_role,
)
}
fn handle_established_outbound_connection(
&mut self,
_connection_id: ConnectionId,
connection_id: ConnectionId,
peer: PeerId,
addr: &Multiaddr,
role_override: Endpoint,
@ -471,10 +471,10 @@ where
peer,
addr.clone(),
role_override,
_connection_id,
connection_id,
));
self.inner
.handle_established_outbound_connection(_connection_id, peer, addr, role_override)
.handle_established_outbound_connection(connection_id, peer, addr, role_override)
}
fn on_swarm_event(&mut self, event: FromSwarm<Self::ConnectionHandler>) {