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

.github/: Enforce no clippy warnings (#2148)

Browse Source 
* Fix remaining clippy warnings.

Co-authored-by: Max Inden <mail@max-inden.de>
This commit is contained in:
Thomas Eizinger
2021-07-26 19:22:46 +10:00
committed by GitHub
parent e437c009dc
commit 7877929af2
9 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.cargo/config.toml Normal file
View File

@ -0,0 +1,3 @@
[alias]
# Temporary solution to have clippy config in a single place until https://github.com/rust-lang/rust-clippy/blob/master/doc/roadmap-2021.md#lintstoml-configuration is shipped.
custom-clippy = "clippy -- -A clippy::type_complexity -A clippy::pedantic -A clippy::style -D warnings"

3
.github/workflows/ci.yml vendored
View File

@ -152,8 +152,7 @@ jobs:
- name: Run cargo clippy
uses: actions-rs/cargo@v1.0.3
with:
command: clippy
args: -- -A clippy::type_complexity -A clippy::pedantic -A clippy::style
command: custom-clippy # cargo alias to allow reuse of config locally
integration-test:
name: Integration tests

1
protocols/relay/src/behaviour.rs
View File

@ -756,6 +756,7 @@ impl NetworkBehaviour for Relay {
}
#[derive(Debug)]
#[allow(clippy::large_enum_variant)]
pub enum BehaviourToListenerMsg {
ConnectionToRelayEstablished,
IncomingRelayedConnection {

1
protocols/relay/src/handler.rs
View File

@ -733,6 +733,7 @@ impl ProtocolsHandler for RelayHandler {
}
}
#[allow(clippy::large_enum_variant)]
pub enum RelayOutboundOpenInfo {
Relay {
dst_peer_id: PeerId,

2
protocols/relay/src/protocol/listen.rs
View File

@ -76,7 +76,7 @@ impl upgrade::InboundUpgrade<NegotiatedSubstream> for RelayListen {
let msg: bytes::BytesMut = substream
.next()
.await
.ok_or(std::io::Error::new(std::io::ErrorKind::UnexpectedEof, ""))??;
.ok_or_else(|| std::io::Error::new(std::io::ErrorKind::UnexpectedEof, ""))??;
let CircuitRelay {
r#type,
src_peer,

2
protocols/relay/src/protocol/outgoing_dst_req.rs
View File

@ -100,7 +100,7 @@ impl upgrade::OutboundUpgrade<NegotiatedSubstream> for OutgoingDstReq {
substream
.next()
.await
.ok_or(OutgoingDstReqError::Io(std::io::Error::new(
.ok_or_else(|| OutgoingDstReqError::Io(std::io::Error::new(
std::io::ErrorKind::UnexpectedEof,
"",
)))??;

4
protocols/relay/src/protocol/outgoing_relay_req.rs
View File

@ -87,7 +87,7 @@ impl upgrade::OutboundUpgrade<NegotiatedSubstream> for OutgoingRelayReq {
}),
dst_peer: Some(circuit_relay::Peer {
id: dst_id.to_bytes(),
addrs: vec![dst_address.unwrap_or(Multiaddr::empty()).to_vec()],
addrs: vec![dst_address.unwrap_or_else(Multiaddr::empty).to_vec()],
}),
code: None,
};
@ -107,7 +107,7 @@ impl upgrade::OutboundUpgrade<NegotiatedSubstream> for OutgoingRelayReq {
substream
.next()
.await
.ok_or(OutgoingRelayReqError::Io(std::io::Error::new(
.ok_or_else(|| OutgoingRelayReqError::Io(std::io::Error::new(
std::io::ErrorKind::UnexpectedEof,
"",
)))??;

4
protocols/relay/src/transport.rs
View File

@ -198,7 +198,7 @@ impl<T: Transport + Clone> Transport for RelayTransport<T> {
};
let (to_listener, from_behaviour) = mpsc::channel(0);
let mut to_behaviour = self.to_behaviour.clone();
let mut to_behaviour = self.to_behaviour;
let msg_to_behaviour = Some(
async move {
to_behaviour
@ -242,7 +242,7 @@ impl<T: Transport + Clone> Transport for RelayTransport<T> {
let relay_addr = relay_addr.ok_or(RelayError::MissingRelayAddr)?;
let dst_peer_id = dst_peer_id.ok_or(RelayError::MissingDstPeerId)?;
let mut to_behaviour = self.to_behaviour.clone();
let mut to_behaviour = self.to_behaviour;
Ok(EitherFuture::Second(
async move {
let (tx, rx) = oneshot::channel();

1
transports/dns/src/lib.rs
View File

@ -330,6 +330,7 @@ where
/// The possible errors of a [`GenDnsConfig`] wrapped transport.
#[derive(Debug)]
#[allow(clippy::large_enum_variant)]
pub enum DnsErr<TErr> {
/// The underlying transport encountered an error.
Transport(TErr),