From 56517ef5de3ce7998f4938d17958912db9e3009c Mon Sep 17 00:00:00 2001
From: Jonathan Kelley <jkelleyrtp@gmail.com>
Date: Sat, 26 Feb 2022 17:35:23 -0500
Subject: [PATCH] fix: merge conflicts

---
 packages/core-macro/src/rsx/mod.rs      | 4 ++--
 packages/core/src/mutations.rs          | 2 ++
 packages/desktop/src/desktop_context.rs | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/core-macro/src/rsx/mod.rs b/packages/core-macro/src/rsx/mod.rs
index e20d80dec..858f07c5c 100644
--- a/packages/core-macro/src/rsx/mod.rs
+++ b/packages/core-macro/src/rsx/mod.rs
@@ -79,7 +79,7 @@ impl ToTokens for CallBody {
         match &self.custom_context {
             // The `in cx` pattern allows directly rendering
             Some(ident) => out_tokens.append_all(quote! {
-                #ident.render(LazyNodes::new_some(move |__cx: NodeFactory| -> VNode {
+                #ident.render(LazyNodes::new(move |__cx: NodeFactory| -> VNode {
                     use dioxus_elements::{GlobalAttributes, SvgAttributes};
                     #inner
                 }))
@@ -87,7 +87,7 @@ impl ToTokens for CallBody {
 
             // Otherwise we just build the LazyNode wrapper
             None => out_tokens.append_all(quote! {
-                LazyNodes::new_some(move |__cx: NodeFactory| -> VNode {
+                LazyNodes::new(move |__cx: NodeFactory| -> VNode {
                     use dioxus_elements::{GlobalAttributes, SvgAttributes};
                     #inner
                 })
diff --git a/packages/core/src/mutations.rs b/packages/core/src/mutations.rs
index 1e84fe059..2d3a4505f 100644
--- a/packages/core/src/mutations.rs
+++ b/packages/core/src/mutations.rs
@@ -181,6 +181,8 @@ pub enum DomEdit<'bump> {
 
         /// The name of the attribute to remove.
         name: &'static str,
+
+        /// The namespace of the attribute.
         ns: Option<&'bump str>,
     },
 }
diff --git a/packages/desktop/src/desktop_context.rs b/packages/desktop/src/desktop_context.rs
index 1376110f1..eaff13750 100644
--- a/packages/desktop/src/desktop_context.rs
+++ b/packages/desktop/src/desktop_context.rs
@@ -125,6 +125,7 @@ use wry::application::window::Fullscreen as WryFullscreen;
 
 use crate::controller::DesktopController;
 
+#[derive(Debug)]
 pub enum UserWindowEvent {
     Update,