Clean up and drop stale events

crates/concoct/src/lib.rs

@@ -68,6 +68,10 @@ pub struct TextViewContext {
 }
 
 impl TextViewContext {
+    /// Create a text view context from a view function.
+    ///
+    /// Text-based views, such as `&str` or `String` will call
+    /// this view function on when rendered.
     pub fn new(view: impl FnMut(Cow<'static, str>) + 'static) -> Self {
         Self {
             view: RefCell::new(Box::new(view)),

crates/concoct/src/rt.rs

@@ -1,17 +1,18 @@
 use crate::Tree;
+use rustc_hash::FxHashMap;
 use slotmap::{DefaultKey, SlotMap};
 use std::{
     any::{Any, TypeId},
     cell::RefCell,
-    collections::{HashMap, VecDeque},
+    collections::VecDeque,
     rc::Rc,
     task::Waker,
     time::Instant,
 };
 
 #[derive(Default)]
 pub(crate) struct ScopeInner {
-    pub(crate) contexts: HashMap<TypeId, Rc<dyn Any>>,
+    pub(crate) contexts: FxHashMap<TypeId, Rc<dyn Any>>,
     pub(crate) hooks: Vec<Rc<dyn Any>>,
     pub(crate) hook_idx: usize,
     pub(crate) droppers: Vec<Box<dyn FnMut()>>,
@@ -29,7 +30,7 @@ pub(crate) struct RuntimeInner {
     pub(crate) scope: Option<Scope>,
     pub(crate) nodes: SlotMap<DefaultKey, *mut dyn Tree>,
     pub(crate) waker: Option<Waker>,
-    pub(crate) contexts: HashMap<TypeId, Rc<dyn Any>>,
+    pub(crate) contexts: FxHashMap<TypeId, Rc<dyn Any>>,
     pub(crate) limit: Option<Instant>,
 }
 

crates/concoct/src/vdom.rs

@@ -11,6 +11,7 @@ pub struct VirtualDom<T> {
 }
 
 impl<T> VirtualDom<T> {
+    /// Create a new virtual dom from a tree.
     pub fn new(tree: T) -> Self {
         VirtualDom {
             cx: Runtime::default(),
@@ -25,6 +26,7 @@ impl<T> VirtualDom<T> {
     {
         self.cx.enter();
 
+        // Safety: Context is dropped when the tree is
         unsafe { self.tree.build() }
     }
 
@@ -62,13 +64,14 @@ impl<T> VirtualDom<T> {
         inner.waker = waker;
 
         if let Some(key) = inner.pending.pop_front() {
-            let raw = inner.nodes[key];
-            drop(inner);
+            if let Some(raw) = inner.nodes.get(key).copied() {
+                drop(inner);
 
-            self.cx.enter();
+                self.cx.enter();
 
-            let pending = unsafe { &mut *raw };
-            unsafe { pending.build() };
+                // Safety: `raw` is guaranteed to be an `&mut dyn Tree`.
+                unsafe { (&mut *raw).build() };
+            }
         }
     }
 }

crates/concoct/src/view/cell.rs

@@ -54,7 +54,7 @@ impl<V: View> Tree for ViewCell<V> {
         self.tree.borrow_mut().as_tree().build()
     }
 
-    unsafe fn rebuild(&mut self, last: &mut dyn Any,is_changed: bool) {
+    unsafe fn rebuild(&mut self, last: &mut dyn Any, is_changed: bool) {
         let last = last.downcast_mut::<Self>().unwrap();
         self.tree
             .borrow_mut()