From 7beb7f0ee4bb32ea9d21430f2036f9ee8e782c7a Mon Sep 17 00:00:00 2001
From: Jonathan Kelley <jkelleyrtp@gmail.com>
Date: Tue, 13 Dec 2022 15:30:40 -0800
Subject: [PATCH] fix: use and_then

---
 packages/native-core/src/real_dom.rs | 2 +-
 packages/tui/src/widgets/mod.rs      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/native-core/src/real_dom.rs b/packages/native-core/src/real_dom.rs
index 656c59b52..621e16577 100644
--- a/packages/native-core/src/real_dom.rs
+++ b/packages/native-core/src/real_dom.rs
@@ -306,7 +306,7 @@ impl<S: State> RealDom<S> {
                     }
                     mark_dirty(node_id, NodeMask::new().with_text(), &mut nodes_updated);
                 }
-                NewEventListener { name, scope: _, id } => {
+                NewEventListener { name, id } => {
                     let node_id = self.element_to_node_id(id);
                     let node = self.tree.get_mut(node_id).unwrap();
                     if let NodeType::Element { listeners, .. } = &mut node.node_data.node_type {
diff --git a/packages/tui/src/widgets/mod.rs b/packages/tui/src/widgets/mod.rs
index 916295e50..25201bddb 100644
--- a/packages/tui/src/widgets/mod.rs
+++ b/packages/tui/src/widgets/mod.rs
@@ -11,7 +11,7 @@ pub use input::*;
 
 pub(crate) fn get_root_id<T>(cx: Scope<T>) -> Option<ElementId> {
     if let RenderReturn::Sync(Ok(sync)) = cx.root_node() {
-        sync.root_ids.get(0).map(|id| id.get())
+        sync.root_ids.get(0).and_then(|id| id.get())
     } else {
         None
     }