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

Fix warnings: range patterns

Browse Source
This commit is contained in:
adria0
2020-07-29 10:41:19 +02:00
committed by Artem Vorotnikov
parent 1700873f48
commit 239cf91594
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
util/network-devp2p/src/host.rs
View File

@@ -1063,7 +1063,7 @@ impl Host {
let mut failure_id = None;
let mut deregister = false;
let mut expired_session = None;
if let FIRST_SESSION...LAST_SESSION = token {
if let FIRST_SESSION..=LAST_SESSION = token {
let sessions = self.sessions.read();
if let Some(session) = sessions.get(token).cloned() {
expired_session = Some(session.clone());
@@ -1167,7 +1167,7 @@ impl IoHandler<NetworkIoMessage> for Host {
fn stream_hup(&self, io: &IoContext<NetworkIoMessage>, stream: StreamToken) {
trace!(target: "network", "Hup: {}", stream);
match stream {
FIRST_SESSION...LAST_SESSION => self.connection_closed(stream, io),
FIRST_SESSION..=LAST_SESSION => self.connection_closed(stream, io),
_ => warn!(target: "network", "Unexpected hup"),
};
}
@@ -1177,7 +1177,7 @@ impl IoHandler<NetworkIoMessage> for Host {
return;
}
match stream {
FIRST_SESSION...LAST_SESSION => self.session_readable(stream, io),
FIRST_SESSION..=LAST_SESSION => self.session_readable(stream, io),
DISCOVERY => self.discovery_readable(io),
TCP_ACCEPT => self.accept(io),
_ => panic!("Received unknown readable token"),
@@ -1189,7 +1189,7 @@ impl IoHandler<NetworkIoMessage> for Host {
return;
}
match stream {
FIRST_SESSION...LAST_SESSION => self.session_writable(stream, io),
FIRST_SESSION..=LAST_SESSION => self.session_writable(stream, io),
DISCOVERY => self.discovery_writable(io),
_ => panic!("Received unknown writable token"),
}
@@ -1201,7 +1201,7 @@ impl IoHandler<NetworkIoMessage> for Host {
}
match token {
IDLE => self.maintain_network(io),
FIRST_SESSION...LAST_SESSION => self.connection_timeout(token, io),
FIRST_SESSION..=LAST_SESSION => self.connection_timeout(token, io),
DISCOVERY_REFRESH => {
// Run the _slow_ discovery if enough peers are connected
if !self.has_enough_peers() {
@@ -1347,7 +1347,7 @@ impl IoHandler<NetworkIoMessage> for Host {
event_loop: &mut EventLoop<IoManager<NetworkIoMessage>>,
) {
match stream {
FIRST_SESSION...LAST_SESSION => {
FIRST_SESSION..=LAST_SESSION => {
let session = { self.sessions.read().get(stream).cloned() };
if let Some(session) = session {
session
@@ -1382,7 +1382,7 @@ impl IoHandler<NetworkIoMessage> for Host {
event_loop: &mut EventLoop<IoManager<NetworkIoMessage>>,
) {
match stream {
FIRST_SESSION...LAST_SESSION => {
FIRST_SESSION..=LAST_SESSION => {
let mut connections = self.sessions.write();
if let Some(connection) = connections.get(stream).cloned() {
let c = connection.lock();
@@ -1406,7 +1406,7 @@ impl IoHandler<NetworkIoMessage> for Host {
event_loop: &mut EventLoop<IoManager<NetworkIoMessage>>,
) {
match stream {
FIRST_SESSION...LAST_SESSION => {
FIRST_SESSION..=LAST_SESSION => {
let connection = { self.sessions.read().get(stream).cloned() };
if let Some(connection) = connection {
connection

2
util/network-devp2p/src/session.rs
View File

@@ -453,7 +453,7 @@ impl Session {
}
PACKET_GET_PEERS => Ok(SessionData::None), //TODO;
PACKET_PEERS => Ok(SessionData::None),
PACKET_USER...PACKET_LAST => {
PACKET_USER..=PACKET_LAST => {
let mut i = 0usize;
while packet_id
>= self.info.capabilities[i].id_offset + self.info.capabilities[i].packet_count