Restoring MSRV 1.70.0

Fixes #120

CHANGELOG.md

@@ -34,6 +34,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Removed a possible deadlock when using `DynamicReader::block_until_updated`.
 - Removed an edge case ensuring `Waker`s are signaled for `DynamicReader`s that
   are waiting for value when the last `Dynamic` is dropped.
+- Compatibility with Rust v1.70.0 has been restored, and continuous integration
+  testing the MSRV has been added.
 
 ### Changed
 

src/context.rs

@@ -1,12 +1,9 @@
 //! Types that provide access to the Cushy runtime.
 use std::borrow::Cow;
 use std::ops::{Deref, DerefMut};
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::{Arc, Mutex, MutexGuard};
 
 use figures::units::{Lp, Px, UPx};
 use figures::{IntoSigned, Point, Px2D, Rect, Round, ScreenScale, Size, Zero};
-use kempt::Set;
 use kludgine::app::winit::event::{
     DeviceId, Ime, KeyEvent, MouseButton, MouseScrollDelta, TouchPhase,
 };
@@ -22,7 +19,6 @@ use crate::styles::components::{
 };
 use crate::styles::{ComponentDefinition, Styles, Theme, ThemePair};
 use crate::tree::Tree;
-use crate::utils::IgnorePoison;
 use crate::value::{IntoValue, Value};
 use crate::widget::{EventHandling, MountedWidget, RootBehavior, WidgetId, WidgetInstance};
 use crate::window::{CursorState, RunningWindow, ThemeMode};
@@ -1267,46 +1263,6 @@ impl DerefMut for PendingState<'_> {
     }
 }
 
-#[derive(Default, Clone)]
-pub(crate) struct InvalidationStatus {
-    refresh_sent: Arc<AtomicBool>,
-    invalidated: Arc<Mutex<Set<WidgetId>>>,
-}
-
-impl InvalidationStatus {
-    pub fn should_send_refresh(&self) -> bool {
-        self.refresh_sent
-            .compare_exchange(false, true, Ordering::Release, Ordering::Acquire)
-            .is_ok()
-    }
-
-    pub fn refresh_received(&self) {
-        self.refresh_sent.store(false, Ordering::Release);
-    }
-
-    pub fn invalidate(&self, widget: WidgetId) -> bool {
-        let mut invalidated = self.invalidated.lock().ignore_poison();
-        invalidated.insert(widget)
-    }
-
-    pub fn invalidations(&self) -> MutexGuard<'_, Set<WidgetId>> {
-        self.invalidated.lock().ignore_poison()
-    }
-}
-
-impl Eq for InvalidationStatus {}
-
-impl PartialEq for InvalidationStatus {
-    fn eq(&self, other: &Self) -> bool {
-        Arc::ptr_eq(&self.invalidated, &other.invalidated)
-    }
-}
-impl std::hash::Hash for InvalidationStatus {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        Arc::as_ptr(&self.invalidated).hash(state);
-    }
-}
-
 /// A type chat can convert to a [`MountedWidget`] through a [`WidgetContext`].
 pub trait ManageWidget {
     /// The managed type, which can be `Option<MountedWidget>` or
@@ -1393,6 +1349,12 @@ pub trait Trackable: sealed::Trackable {}
 impl<T> Trackable for T where T: sealed::Trackable {}
 
 pub(crate) mod sealed {
+    use std::sync::atomic::{AtomicBool, Ordering};
+    use std::sync::{Arc, Mutex, MutexGuard};
+
+    use kempt::Set;
+
+    use crate::utils::IgnorePoison;
     use crate::widget::WidgetId;
     use crate::window::WindowHandle;
 
@@ -1400,4 +1362,44 @@ pub(crate) mod sealed {
         fn redraw_when_changed(&self, handle: WindowHandle);
         fn invalidate_when_changed(&self, handle: WindowHandle, id: WidgetId);
     }
+
+    #[derive(Default, Clone)]
+    pub struct InvalidationStatus {
+        refresh_sent: Arc<AtomicBool>,
+        invalidated: Arc<Mutex<Set<WidgetId>>>,
+    }
+
+    impl InvalidationStatus {
+        pub fn should_send_refresh(&self) -> bool {
+            self.refresh_sent
+                .compare_exchange(false, true, Ordering::Release, Ordering::Acquire)
+                .is_ok()
+        }
+
+        pub fn refresh_received(&self) {
+            self.refresh_sent.store(false, Ordering::Release);
+        }
+
+        pub fn invalidate(&self, widget: WidgetId) -> bool {
+            let mut invalidated = self.invalidated.lock().ignore_poison();
+            invalidated.insert(widget)
+        }
+
+        pub fn invalidations(&self) -> MutexGuard<'_, Set<WidgetId>> {
+            self.invalidated.lock().ignore_poison()
+        }
+    }
+
+    impl Eq for InvalidationStatus {}
+
+    impl PartialEq for InvalidationStatus {
+        fn eq(&self, other: &Self) -> bool {
+            Arc::ptr_eq(&self.invalidated, &other.invalidated)
+        }
+    }
+    impl std::hash::Hash for InvalidationStatus {
+        fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+            Arc::as_ptr(&self.invalidated).hash(state);
+        }
+    }
 }

src/window.rs

@@ -29,9 +29,9 @@ use tracing::Level;
 
 use crate::animation::{LinearInterpolate, PercentBetween, ZeroToOne};
 use crate::app::{Application, Cushy, Open, PendingApp, Run};
+use crate::context::sealed::InvalidationStatus;
 use crate::context::{
-    AsEventContext, EventContext, Exclusive, GraphicsContext, InvalidationStatus, LayoutContext,
-    WidgetContext,
+    AsEventContext, EventContext, Exclusive, GraphicsContext, LayoutContext, WidgetContext,
 };
 use crate::graphics::{FontState, Graphics};
 use crate::styles::{Edges, FontFamilyList, ThemePair};
@@ -1472,7 +1472,7 @@ pub(crate) mod sealed {
     use figures::Size;
 
     use crate::app::Cushy;
-    use crate::context::InvalidationStatus;
+    use crate::context::sealed::InvalidationStatus;
     use crate::styles::{FontFamilyList, ThemePair};
     use crate::value::{Dynamic, Value};
     use crate::widget::OnceCallback;