From cebf17088bbaa1f75e639a0ac2f10970ebc0e418 Mon Sep 17 00:00:00 2001 From: Evan Almloff Date: Wed, 20 Apr 2022 12:17:16 -0500 Subject: [PATCH] fixed infinite loop in union_ordered_iter --- packages/native-core-macro/src/lib.rs | 1 - packages/native-core/src/state.rs | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/native-core-macro/src/lib.rs b/packages/native-core-macro/src/lib.rs index d645a2398..508754bf7 100644 --- a/packages/native-core-macro/src/lib.rs +++ b/packages/native-core-macro/src/lib.rs @@ -638,7 +638,6 @@ impl<'a> StateMember<'a> { let ty = &self.mem.ty; let node_view = quote!(dioxus_native_core::node_ref::NodeView::new(node, #ty::NODE_MASK, vdom)); - let id = self.member_id.0; if let Some(dep_ident) = &self.dep_mem.map(|m| &m.ident) { match self.dep_kind { DepKind::Node => { diff --git a/packages/native-core/src/state.rs b/packages/native-core/src/state.rs index b7c1f59c7..b55f217d0 100644 --- a/packages/native-core/src/state.rs +++ b/packages/native-core/src/state.rs @@ -26,7 +26,10 @@ pub(crate) fn union_ordered_iter( Ordering::Less => { v.push(o_peekable.next().unwrap()); } - Ordering::Equal => (), + Ordering::Equal => { + o_peekable.next(); + break; + } } } v.push(s_peekable.next().unwrap());