Update parking_lot and fix deprecation warnings on Box<Future>s

Cargo.toml

@@ -1,21 +1,22 @@
 [package]
 name = "aio-limited"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "Apache-2.0 OR MIT"
 description = "Rate-limited async I/O."
 repository = "https://github.com/paritytech/aio-limited"
 readme = "README.md"
+edition = "2018"
 
 [dependencies]
 futures = "0.1"
 log = "0.4"
-parking_lot = "0.5"
+parking_lot = "0.9"
 tokio-executor = "0.1"
 tokio-io = "0.1"
 tokio-timer = "0.2"
 
 [dev-dependencies]
-env_logger = "0.5"
+env_logger = "0.6"
 tokio = "0.1"
 

src/algorithms/bucket.rs

@@ -9,7 +9,7 @@
 // at https://opensource.org/licenses/MIT.
 
 use crate::{algorithms::{Id, Token}, error::{Error, Result}};
-use parking_lot::Mutex;
+use parking_lot::{Mutex, lock_api::MutexGuard};
 use std::{cmp::min, sync::atomic::{AtomicUsize, Ordering}};
 
 /// A bucket has a certain capacity which is made available as `Token`s
@@ -73,7 +73,7 @@ impl Bucket {
 
         cap.value -= quant;
         let t = Token::new(cap.index, quant);
-        cap.unlock_fair();
+        MutexGuard::unlock_fair(cap);
         Ok(t)
     }
 

src/lib.rs

@@ -8,16 +8,6 @@
 // at https://www.apache.org/licenses/LICENSE-2.0 and a copy of the MIT license
 // at https://opensource.org/licenses/MIT.
 
-extern crate futures;
-extern crate log;
-extern crate parking_lot;
-extern crate tokio_executor;
-extern crate tokio_io;
-extern crate tokio_timer;
-
-#[cfg(test)]
-extern crate tokio;
-
 mod algorithms;
 mod error;
 mod limited;

src/limiter.rs

@@ -114,7 +114,7 @@ mod tests {
         addr: &str,
         lr: Option<Limiter>,
         lw: Limiter,
-    ) -> Box<Future<Item = (), Error = ()> + Send> {
+    ) -> Box<dyn Future<Item = (), Error = ()> + Send> {
         let srv = TcpListener::bind(&addr.parse().unwrap())
             .unwrap()
             .incoming()
@@ -123,9 +123,9 @@ mod tests {
                 let (r, w) = s.split();
                 let reader = match lr {
                     Some(ref lim) => {
-                        Box::new(Limited::new(r, lim.clone()).unwrap()) as Box<AsyncRead + Send>
+                        Box::new(Limited::new(r, lim.clone()).unwrap()) as Box<dyn AsyncRead + Send>
                     }
-                    None => Box::new(r) as Box<AsyncRead + Send>,
+                    None => Box::new(r) as Box<dyn AsyncRead + Send>,
                 };
                 let writer = Limited::new(w, lw.clone()).unwrap();
                 let future = copy(reader, writer)
@@ -136,7 +136,7 @@ mod tests {
         Box::new(srv)
     }
 
-    fn echo_client(addr: &str) -> Box<Future<Item = (), Error = ()> + Send> {
+    fn echo_client(addr: &str) -> Box<dyn Future<Item = (), Error = ()> + Send> {
         let clt = TcpStream::connect(&addr.parse().unwrap())
             .and_then(|stream| copy(&b"0123456789"[..], stream))
             .and_then(|(n, _, stream)| read_exact(stream, vec![0; n as usize]))
@@ -145,7 +145,7 @@ mod tests {
         Box::new(clt)
     }
 
-    fn echo_rate_client(addr: &str, size: usize) -> Box<Future<Item = (), Error = ()> + Send> {
+    fn echo_rate_client(addr: &str, size: usize) -> Box<dyn Future<Item = (), Error = ()> + Send> {
         let clt = TcpStream::connect(&addr.parse().unwrap())
             .and_then(move |stream| {
                 Delay::new(Instant::now() + Duration::from_secs(1)).then(|_| Ok(stream))