Rebase upstream

Author: jmfrank63

governor/tests/future.rs

@@ -1,10 +1,16 @@
 #![cfg(feature = "std")]
 
+use all_asserts::assert_ge;
 use futures::executor::block_on;
 use governor::{Quota, RateLimiter};
 use nonzero_ext::*;
 use std::sync::Arc;
 use std::thread;
+use std::time::{Duration, Instant};
+
+/// The time that our "real" clock tests may take, indicating that no
+/// blocking waits have occurred.
+const MAX_TEST_RUN_DURATION: Duration = Duration::from_micros(200);
 
 #[test]
 fn pauses() {
@@ -75,7 +81,7 @@ fn proceeds_keyed_n() {
     let lim = RateLimiter::keyed(Quota::per_second(nonzero!(3u32)));
     let i = Instant::now();
     block_on(lim.until_key_n_ready(&1u32, nonzero!(2u32))).unwrap();
-    assert_le!(i.elapsed(), MAX_TEST_RUN_DURATION);
+    all_asserts::assert_le!(i.elapsed(), MAX_TEST_RUN_DURATION);
 }
 
 #[test]