New upstream version 1.46.0~beta.2+dfsg1

[rustc.git] / vendor / parking_lot / src / condvar.rs

diff --git a/vendor/parking_lot/src/condvar.rs b/vendor/parking_lot/src/condvar.rs
index 0afda3a5b109d8a79b2cb58a35ae64ba3d22b30f..54511686596fec88faf26fd2b325a0c8d8c7998a 100644 (file)
--- a/vendor/parking_lot/src/condvar.rs
+++ b/vendor/parking_lot/src/condvar.rs
@@ -12,9 +12,10 @@ use core::{
     fmt, ptr,
     sync::atomic::{AtomicPtr, Ordering},
 };
+use instant::Instant;
 use lock_api::RawMutex as RawMutex_;
 use parking_lot_core::{self, ParkResult, RequeueOp, UnparkResult, DEFAULT_PARK_TOKEN};
-use std::time::{Duration, Instant};
+use std::time::Duration;
 
 /// A type indicating whether a timed wait on a condition variable returned
 /// due to a time out or not.
@@ -413,10 +414,11 @@ impl fmt::Debug for Condvar {
 #[cfg(test)]
 mod tests {
     use crate::{Condvar, Mutex, MutexGuard};
+    use instant::Instant;
     use std::sync::mpsc::channel;
     use std::sync::Arc;
     use std::thread;
-    use std::time::{Duration, Instant};
+    use std::time::Duration;
 
     #[test]
     fn smoke() {