Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

*: Enforce no clippy warnings for examples #2826

Merged
merged 11 commits into from Aug 20, 2022
2 changes: 1 addition & 1 deletion .cargo/config.toml
@@ -1,3 +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 --all-features -- -A clippy::type_complexity -A clippy::pedantic -D warnings"
custom-clippy = "clippy --all-features --all-targets -- -A clippy::type_complexity -A clippy::pedantic -D warnings"
9 changes: 4 additions & 5 deletions examples/chat-tokio.rs
Expand Up @@ -91,6 +91,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
mdns: Mdns,
}

#[allow(clippy::large_enum_variant)]
enum MyBehaviourEvent {
Floodsub(FloodsubEvent),
Mdns(MdnsEvent),
Expand All @@ -112,7 +113,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
let mut swarm = {
let mdns = Mdns::new(Default::default()).await?;
let mut behaviour = MyBehaviour {
floodsub: Floodsub::new(peer_id.clone()),
floodsub: Floodsub::new(peer_id),
mdns,
};

Expand Down Expand Up @@ -152,14 +153,12 @@ async fn main() -> Result<(), Box<dyn Error>> {
SwarmEvent::NewListenAddr { address, .. } => {
println!("Listening on {:?}", address);
}
SwarmEvent::Behaviour(MyBehaviourEvent::Floodsub(event)) => {
if let FloodsubEvent::Message(message) = event {
println!(
SwarmEvent::Behaviour(MyBehaviourEvent::Floodsub(FloodsubEvent::Message(message))) => {
println!(
"Received: '{:?}' from {:?}",
String::from_utf8_lossy(&message.data),
message.source
);
}
}
SwarmEvent::Behaviour(MyBehaviourEvent::Mdns(event)) => {
match event {
Expand Down
1 change: 1 addition & 0 deletions examples/chat.rs
Expand Up @@ -92,6 +92,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
ignored_member: bool,
}

#[allow(clippy::large_enum_variant)]
#[derive(Debug)]
enum OutEvent {
Floodsub(FloodsubEvent),
Expand Down
15 changes: 6 additions & 9 deletions examples/file-sharing.rs
Expand Up @@ -221,7 +221,7 @@ mod network {
};
use libp2p::swarm::{ConnectionHandlerUpgrErr, SwarmBuilder, SwarmEvent};
use libp2p::{NetworkBehaviour, Swarm};
use std::collections::{HashMap, HashSet};
use std::collections::{hash_map, HashMap, HashSet};
use std::iter;

/// Creates the network components, namely:
Expand Down Expand Up @@ -359,10 +359,7 @@ mod network {
channel: ResponseChannel<FileResponse>,
) {
self.sender
.send(Command::RespondFile {
file: file,
channel,
})
.send(Command::RespondFile { file, channel })
.await
.expect("Command receiver not to be dropped.");
}
Expand Down Expand Up @@ -527,9 +524,7 @@ mod network {
peer_addr,
sender,
} => {
if self.pending_dial.contains_key(&peer_id) {
todo!("Already dialing peer.");
} else {
if let hash_map::Entry::Vacant(e) = self.pending_dial.entry(peer_id) {
self.swarm
.behaviour_mut()
.kademlia
Expand All @@ -539,12 +534,14 @@ mod network {
.dial(peer_addr.with(Protocol::P2p(peer_id.into())))
{
Ok(()) => {
self.pending_dial.insert(peer_id, sender);
e.insert(sender);
}
Err(e) => {
let _ = sender.send(Err(Box::new(e)));
}
}
} else {
todo!("Already dialing peer.");
}
}
Command::StartProviding { file_name, sender } => {
Expand Down
1 change: 0 additions & 1 deletion examples/gossipsub-chat.rs
Expand Up @@ -101,7 +101,6 @@ async fn main() -> Result<(), Box<dyn Error>> {

// add an explicit peer if one was provided
if let Some(explicit) = std::env::args().nth(2) {
let explicit = explicit.clone();
match explicit.parse() {
Ok(id) => gossipsub.add_explicit_peer(&id),
Err(err) => println!("Failed to parse explicit peer id: {:?}", err),
Expand Down
2 changes: 1 addition & 1 deletion examples/ipfs-kad.rs
Expand Up @@ -34,7 +34,7 @@ use libp2p::{
};
use std::{env, error::Error, str::FromStr, time::Duration};

const BOOTNODES: [&'static str; 4] = [
const BOOTNODES: [&str; 4] = [
"QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN",
"QmQCU2EcMqAqQPR2i9bChDtGNJchTbq5TbXJJ16u19uLTa",
"QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb",
Expand Down
8 changes: 4 additions & 4 deletions examples/ipfs-private.rs
Expand Up @@ -92,7 +92,7 @@ fn get_ipfs_path() -> Box<Path> {
}

/// Read the pre shared key file from the given ipfs directory
fn get_psk(path: Box<Path>) -> std::io::Result<Option<String>> {
fn get_psk(path: &Path) -> std::io::Result<Option<String>> {
let swarm_key_file = path.join("swarm.key");
match fs::read_to_string(swarm_key_file) {
Ok(text) => Ok(Some(text)),
Expand Down Expand Up @@ -136,17 +136,17 @@ fn parse_legacy_multiaddr(text: &str) -> Result<Multiaddr, Box<dyn Error>> {
async fn main() -> Result<(), Box<dyn Error>> {
env_logger::init();

let ipfs_path: Box<Path> = get_ipfs_path();
let ipfs_path = get_ipfs_path();
println!("using IPFS_PATH {:?}", ipfs_path);
let psk: Option<PreSharedKey> = get_psk(ipfs_path)?
let psk: Option<PreSharedKey> = get_psk(&ipfs_path)?
.map(|text| PreSharedKey::from_str(&text))
.transpose()?;

// Create a random PeerId
let local_key = identity::Keypair::generate_ed25519();
let local_peer_id = PeerId::from(local_key.public());
println!("using random peer id: {:?}", local_peer_id);
for psk in psk {
if let Some(psk) = psk {
println!("using swarm key with fingerprint: {}", psk.fingerprint());
}

Expand Down