From 7f0fa07757c62930f60577fa762035e6bcdd4cd0 Mon Sep 17 00:00:00 2001 From: Evan Almloff Date: Wed, 4 Oct 2023 09:11:21 -0500 Subject: [PATCH] fix hot reloading --- packages/core-macro/tests/rsx.rs | 2 -- packages/fullstack/src/hooks/server_cached.rs | 1 + packages/rsx/src/attribute.rs | 16 +++++++++++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/packages/core-macro/tests/rsx.rs b/packages/core-macro/tests/rsx.rs index ff01681fb..f4037f928 100644 --- a/packages/core-macro/tests/rsx.rs +++ b/packages/core-macro/tests/rsx.rs @@ -1,5 +1,3 @@ -use dioxus::prelude::*; - #[test] fn rsx() { let t = trybuild::TestCases::new(); diff --git a/packages/fullstack/src/hooks/server_cached.rs b/packages/fullstack/src/hooks/server_cached.rs index 519f70dae..fdccd070a 100644 --- a/packages/fullstack/src/hooks/server_cached.rs +++ b/packages/fullstack/src/hooks/server_cached.rs @@ -15,6 +15,7 @@ use serde::{de::DeserializeOwned, Serialize}; /// let state1 = use_state(cx, || from_server(|| { /// 1234 /// })); +/// todo!() /// } /// ``` pub fn server_cached(server_fn: impl Fn() -> O) -> O { diff --git a/packages/rsx/src/attribute.rs b/packages/rsx/src/attribute.rs index 76acc43bf..4c0db5a33 100644 --- a/packages/rsx/src/attribute.rs +++ b/packages/rsx/src/attribute.rs @@ -37,12 +37,26 @@ impl ToTokens for AttributeType { } } -#[derive(PartialEq, Eq, Clone, Debug, Hash)] +#[derive(Clone, Debug)] pub struct ElementAttrNamed { pub el_name: ElementName, pub attr: ElementAttr, } +impl Hash for ElementAttrNamed { + fn hash(&self, state: &mut H) { + self.attr.name.hash(state); + } +} + +impl PartialEq for ElementAttrNamed { + fn eq(&self, other: &Self) -> bool { + self.attr == other.attr + } +} + +impl Eq for ElementAttrNamed {} + impl ElementAttrNamed { pub(crate) fn try_combine(&self, other: &Self) -> Option { if self.el_name == other.el_name && self.attr.name == other.attr.name {