aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/lib.rs1
-rw-r--r--src/main.rs1
-rw-r--r--src/peer.rs4
-rw-r--r--src/ratelimiter.rs7
4 files changed, 7 insertions, 6 deletions
diff --git a/src/lib.rs b/src/lib.rs
index 7b038b7..7a3b5a3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,3 +1,4 @@
+#![warn(clippy)]
#![feature(ip_constructors)]
#![feature(try_trait)]
#![feature(try_from)]
diff --git a/src/main.rs b/src/main.rs
index 92b74d9..c056150 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,5 @@
#![feature(test)]
+#![warn(clippy)]
#[macro_use] extern crate failure;
#[macro_use] extern crate structopt_derive;
diff --git a/src/peer.rs b/src/peer.rs
index 3c6f126..04d6a93 100644
--- a/src/peer.rs
+++ b/src/peer.rs
@@ -364,7 +364,7 @@ impl Peer {
session_type
};
- if raw_packet.len() > 0 {
+ if !raw_packet.is_empty() {
self.timers.data_received = Timestamp::now();
}
self.timers.authenticated_received = Timestamp::now();
@@ -410,7 +410,7 @@ impl Peer {
let len = session.noise.write_message(padded_packet, &mut out_packet[16..])?;
self.tx_bytes += len as u64;
- if packet.len() > 0 {
+ if !packet.is_empty() {
self.timers.data_sent = Timestamp::now();
}
self.timers.authenticated_traversed = Timestamp::now();
diff --git a/src/ratelimiter.rs b/src/ratelimiter.rs
index 299995e..18082b0 100644
--- a/src/ratelimiter.rs
+++ b/src/ratelimiter.rs
@@ -55,7 +55,7 @@ impl RateLimiter {
pub fn allow(&mut self, addr: &IpAddr) -> bool {
if let Some(entry) = self.table.get_mut(addr) {
- entry.tokens = MAX_TOKENS.min(entry.tokens + entry.last_time.elapsed().subsec_nanos() as u64);
+ entry.tokens = MAX_TOKENS.min(entry.tokens + u64::from(entry.last_time.elapsed().subsec_nanos()));
entry.last_time = Timestamp::now();
if entry.tokens > PACKET_COST {
@@ -83,9 +83,8 @@ impl Future for RateLimiter {
type Error = ();
fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
- match self.rx.poll() {
- Ok(Async::Ready(Some(()))) => self.handle_gc(),
- _ => {},
+ if let Ok(Async::Ready(Some(()))) = self.rx.poll() {
+ self.handle_gc();
}
Ok(Async::NotReady)
}