Merge pull request #37 from communityvi/update-dependencies

Update dependencies

Cargo.toml

@@ -1,2 +1,3 @@
 [workspace]
 members = ["async-time-mock*"]
+resolver = "2"

async-time-mock-async-std/src/instant.rs

@@ -95,13 +95,7 @@ impl Instant {
 
 impl PartialOrd for Instant {
 	fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-		match (self, other) {
-			(Instant::Real(this), Instant::Real(other)) => this.partial_cmp(other),
-			#[cfg(feature = "mock")]
-			(Instant::Mock(this), Instant::Mock(other)) => this.partial_cmp(other),
-			#[cfg(feature = "mock")]
-			_ => panic!("Instants weren't compatible, both need to be either real or mocked"),
-		}
+		Some(self.cmp(other))
 	}
 }
 

async-time-mock-core/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "async-time-mock-core"
 description = "Mockable time for use in async runtimes (core package)."
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 license = "MIT"
 authors = [
@@ -11,10 +11,10 @@ authors = [
 rust-version = "1.64"
 
 [dependencies]
-async-lock = "2"
-event-listener = "2"
+async-lock = { version = "3", default-features = false }
+event-listener = { version = "3", default-features = false }
 pin-project-lite = "0.2"
 
 [dev-dependencies]
-futures-lite = {version = "1", default-features = false}
+futures-lite = { version = "2", default-features = false }
 tokio = {version = "1", features = ["rt", "macros"]}

async-time-mock-core/src/time_handler_guard.rs

@@ -1,4 +1,5 @@
 use event_listener::{Event, EventListener};
+use std::pin::Pin;
 
 #[must_use = "TimeHandlerGuard must be kept until the timer has performed it's side-effects"]
 pub struct TimeHandlerGuard(Event);
@@ -17,7 +18,7 @@ impl Drop for TimeHandlerGuard {
 	}
 }
 
-pub(crate) struct TimeHandlerFinished(EventListener);
+pub(crate) struct TimeHandlerFinished(Pin<Box<EventListener>>);
 
 impl TimeHandlerFinished {
 	pub(crate) async fn wait(self) {

async-time-mock-core/src/timer.rs

@@ -1,6 +1,7 @@
 use crate::time_handler_guard::TimeHandlerFinished;
 use crate::TimeHandlerGuard;
 use event_listener::{Event, EventListener};
+use std::pin::Pin;
 
 pub(crate) struct Timer {
 	trigger: Event,
@@ -35,7 +36,7 @@ impl Timer {
 }
 
 pub(crate) struct TimerListener {
-	listener: EventListener,
+	listener: Pin<Box<EventListener>>,
 	handler_guard: TimeHandlerGuard,
 }
 

async-time-mock-core/src/timer_registry.rs

@@ -110,7 +110,7 @@ impl TimerRegistry {
 
 	fn schedule_timer(mut timers_by_time: RwLockWriteGuard<'_, TimersByTime>, at: Duration) -> TimerListener {
 		let (timer, listener) = Timer::new();
-		timers_by_time.entry(at).or_insert_with(VecDeque::new).push_back(timer);
+		timers_by_time.entry(at).or_default().push_back(timer);
 		listener
 	}
 

async-time-mock-smol/src/instant.rs

@@ -95,13 +95,7 @@ impl Instant {
 
 impl PartialOrd for Instant {
 	fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-		match (self, other) {
-			(Instant::Real(this), Instant::Real(other)) => this.partial_cmp(other),
-			#[cfg(feature = "mock")]
-			(Instant::Mock(this), Instant::Mock(other)) => this.partial_cmp(other),
-			#[cfg(feature = "mock")]
-			_ => panic!("Instants weren't compatible, both need to be either real or mocked"),
-		}
+		Some(self.cmp(other))
 	}
 }
 

async-time-mock-tokio/src/instant.rs

@@ -96,13 +96,7 @@ impl Instant {
 
 impl PartialOrd for Instant {
 	fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-		match (self, other) {
-			(Instant::Real(this), Instant::Real(other)) => this.partial_cmp(other),
-			#[cfg(feature = "mock")]
-			(Instant::Mock(this), Instant::Mock(other)) => this.partial_cmp(other),
-			#[cfg(feature = "mock")]
-			_ => panic!("Instants weren't compatible, both need to be either real or mocked"),
-		}
+		Some(self.cmp(other))
 	}
 }