grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1403 from ethcore/bump-clippy

Browse Source 
Bump clippy
This commit is contained in:
Robert Habermeier
2016-06-23 14:23:46 +02:00
committed by GitHub
parent f3486c48ea 5bf906625b
commit 082294fe81
16 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
util/Cargo.toml
View File

@@ -28,7 +28,7 @@ crossbeam = "0.2"
slab = "0.2"
sha3 = { path = "sha3" }
serde = "0.7.0"
clippy = { version = "0.0.76", optional = true}
clippy = { version = "0.0.77", optional = true}
json-tests = { path = "json-tests" }
igd = "0.4.2"
ethcore-devtools = { path = "../devtools" }

1
util/src/network/host.rs
View File

@@ -735,6 +735,7 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
self.kill_connection(token, io, true);
}
#[cfg_attr(feature="dev", allow(collapsible_if))]
fn session_readable(&self, token: StreamToken, io: &IoContext<NetworkIoMessage<Message>>) {
let mut ready_data: Vec<ProtocolId> = Vec::new();
let mut packet_data: Vec<(ProtocolId, PacketId, Vec<u8>)> = Vec::new();