Rebased #12 - Updated to Rust 2018, ran Rustfmt, and fixed Clippy lints

Cargo.toml

@@ -1,6 +1,7 @@
 [package]
 name = "tokio-ping"
-version = "0.3.0"
+version = "0.3.1"
+edition = "2018"
 license = "MIT/Apache-2.0"
 authors = ["Fedor Gogolev <[email protected]>"]
 documentation = "https://docs.rs/tokio-ping"
@@ -10,16 +11,18 @@ keywords = ["tokio", "icmp", "ping"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-failure = "0.1.1"
+failure = "0.1.3"
 futures = "0.1"
 libc = "0.2"
 mio = "0.6"
-rand = "0.4"
+rand = "0.7"
 socket2 = "0.3"
-tokio-executor="0.1.2"
+time = "0.1"
+tokio = "0.1.13"
+tokio-executor="0.1.5"
 tokio-reactor = "0.1.1"
 tokio-timer = "0.2.3"
-parking_lot = "0.5.5"
+parking_lot = "0.9"
 
 [dev-dependencies]
-tokio = "0.1"
+tokio = "0.1"

README.md

@@ -10,11 +10,6 @@ tokio-ping is an asynchronous ICMP pinging library.
 Note, sending and receiving ICMP packets requires privileges.
 
 ```rust
-extern crate futures;
-extern crate tokio;
-
-extern crate tokio_ping;
-
 use futures::{Future, Stream};
 
 fn main() {

examples/simple.rs

@@ -20,7 +20,5 @@ fn main() {
         })
     });
 
-    tokio::run(future.map_err(|err| {
-        eprintln!("Error: {}", err)
-    }))
+    tokio::run(future.map_err(|err| eprintln!("Error: {}", err)))
 }

src/errors.rs

@@ -1,14 +1,14 @@
 use std::fmt;
 
-use failure::{Fail, Context, Backtrace};
+use failure::{Backtrace, Context, Fail};
 
 #[derive(Debug)]
 pub struct Error {
-    inner: Context<ErrorKind>
+    inner: Context<ErrorKind>,
 }
 
 impl Fail for Error {
-    fn cause(&self) -> Option<&Fail> {
+    fn cause(&self) -> Option<&dyn Fail> {
         self.inner.cause()
     }
 
@@ -25,22 +25,22 @@ impl fmt::Display for Error {
 
 impl From<ErrorKind> for Error {
     fn from(kind: ErrorKind) -> Error {
-        Error { inner: Context::new(kind) }
+        Error {
+            inner: Context::new(kind),
+        }
     }
 }
 
 impl From<Context<ErrorKind>> for Error {
     fn from(inner: Context<ErrorKind>) -> Error {
-        Error { inner: inner }
+        Error { inner }
     }
 }
 
 impl From<::std::io::Error> for Error {
     fn from(error: ::std::io::Error) -> Self {
         Error {
-            inner: Context::new(ErrorKind::IoError {
-                error
-            })
+            inner: Context::new(ErrorKind::IoError { error }),
         }
     }
 }
@@ -52,7 +52,5 @@ pub enum ErrorKind {
     #[fail(display = "internal error")]
     InternalError,
     #[fail(display = "io error: {}", error)]
-    IoError {
-        error: ::std::io::Error
-    }
+    IoError { error: ::std::io::Error },
 }

src/lib.rs

@@ -7,11 +7,6 @@
 //! Note, sending and receiving ICMP packets requires privileges.
 //!
 //! ```rust,no_run
-//! extern crate futures;
-//! extern crate tokio;
-//!
-//! extern crate tokio_ping;
-//!
 //! use futures::{Future, Stream};
 //!
 //! fn main() {
@@ -35,21 +30,10 @@
 //! }
 //! ```
 
-#[macro_use] extern crate failure;
-#[macro_use] extern crate futures;
-extern crate libc;
-extern crate mio;
-extern crate rand;
-extern crate socket2;
-extern crate parking_lot;
-extern crate tokio_executor;
-extern crate tokio_reactor;
-extern crate tokio_timer;
-
 mod errors;
 mod packet;
 mod ping;
 mod socket;
 
-pub use errors::Error;
-pub use ping::{Pinger, PingChain, PingChainStream, PingFuture};
+pub use self::errors::Error;
+pub use self::ping::{PingChain, PingChainStream, PingFuture, Pinger};

src/packet/icmp.rs

@@ -1,3 +1,4 @@
+use failure::Fail;
 use std::io::Write;
 
 pub const HEADER_SIZE: usize = 8;
@@ -50,8 +51,8 @@ impl<'a> EchoRequest<'a> {
         buffer[6] = (self.seq_cnt >> 8) as u8;
         buffer[7] = self.seq_cnt as u8;
 
-        if let Err(_) = (&mut buffer[8..]).write(self.payload) {
-            return Err(Error::InvalidSize)
+        if (&mut buffer[8..]).write(self.payload).is_err() {
+            return Err(Error::InvalidSize);
         }
 
         write_checksum(buffer);
@@ -62,19 +63,19 @@ impl<'a> EchoRequest<'a> {
 pub struct EchoReply<'a> {
     pub ident: u16,
     pub seq_cnt: u16,
-    pub payload: &'a [u8]
+    pub payload: &'a [u8],
 }
 
 impl<'a> EchoReply<'a> {
     pub fn decode<P: Proto>(buffer: &'a [u8]) -> Result<Self, Error> {
-        if buffer.as_ref().len() < HEADER_SIZE {
-            return Err(Error::InvalidSize)
+        if buffer.len() < HEADER_SIZE {
+            return Err(Error::InvalidSize);
         }
 
         let type_ = buffer[0];
         let code = buffer[1];
         if type_ != P::ECHO_REPLY_TYPE && code != P::ECHO_REPLY_CODE {
-            return Err(Error::InvalidPacket)
+            return Err(Error::InvalidPacket);
         }
 
         let ident = (u16::from(buffer[4]) << 8) + u16::from(buffer[5]);
@@ -83,7 +84,9 @@ impl<'a> EchoReply<'a> {
         let payload = &buffer[HEADER_SIZE..];
 
         Ok(EchoReply {
-            ident, seq_cnt, payload
+            ident,
+            seq_cnt,
+            payload,
         })
     }
 }

src/packet/ipv4.rs

@@ -1,3 +1,5 @@
+use failure::Fail;
+
 #[derive(Debug, Fail)]
 pub enum Error {
     #[fail(display = "too small header")]
@@ -54,7 +56,7 @@ impl<'a> IpV4Packet<'a> {
         };
 
         Ok(Self {
-            protocol: protocol,
+            protocol,
             data: &data[header_size..],
         })
     }

src/packet/mod.rs

@@ -1,6 +1,6 @@
 mod icmp;
 mod ipv4;
 
-pub use self::icmp::{HEADER_SIZE as ICMP_HEADER_SIZE, IcmpV4, IcmpV6, EchoRequest, EchoReply};
+pub use self::icmp::{EchoReply, EchoRequest, IcmpV4, IcmpV6, HEADER_SIZE as ICMP_HEADER_SIZE};
 
 pub use self::ipv4::{IpV4Packet, IpV4Protocol};