From 07da8544556238ee03e9de0a953a8bebac2fb101 Mon Sep 17 00:00:00 2001
From: Evan Almloff <ealmlof1@stumail.jccc.edu>
Date: Thu, 26 May 2022 19:21:53 -0500
Subject: [PATCH] compare parsed expressions instead of strings

---
 examples/hot_reload.rs                            |  2 +-
 packages/rsx_interperter/src/captuered_context.rs |  6 +++---
 packages/rsx_interperter/src/interperter.rs       | 11 ++++++-----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/examples/hot_reload.rs b/examples/hot_reload.rs
index be7d9e533..7fe3f4d5a 100644
--- a/examples/hot_reload.rs
+++ b/examples/hot_reload.rs
@@ -20,7 +20,7 @@ fn app(cx: Scope) -> Element {
 
     cx.render(rsx! {
         h1 {
-            x: count,
+            width: format!("{}px", count),
             "High-Five counter: {count}"
         }
     })
diff --git a/packages/rsx_interperter/src/captuered_context.rs b/packages/rsx_interperter/src/captuered_context.rs
index 639752ffc..2bfa2dcc9 100644
--- a/packages/rsx_interperter/src/captuered_context.rs
+++ b/packages/rsx_interperter/src/captuered_context.rs
@@ -1,7 +1,7 @@
 use dioxus_core::VNode;
 use dioxus_rsx::{BodyNode, CallBody, Component, ElementAttr, IfmtInput};
 use quote::{quote, ToTokens, TokenStreamExt};
-use std::{any::Any, collections::HashMap};
+use std::collections::HashMap;
 use syn::Expr;
 
 #[derive(Default)]
@@ -41,7 +41,7 @@ impl CapturedContextBuilder {
                             let formated: IfmtInput = syn::parse2(value_tokens).unwrap();
                             captured.attributes.insert(name, formated);
                         }
-                        ElementAttr::AttrExpression { name, value } => {
+                        ElementAttr::AttrExpression { name: _, value } => {
                             captured.captured_expressions.push(value);
                         }
                         ElementAttr::CustomAttrText { name, value } => {
@@ -49,7 +49,7 @@ impl CapturedContextBuilder {
                             let formated: IfmtInput = syn::parse2(value_tokens).unwrap();
                             captured.attributes.insert(name, formated);
                         }
-                        ElementAttr::CustomAttrExpression { name, value } => {
+                        ElementAttr::CustomAttrExpression { name: _, value } => {
                             captured.captured_expressions.push(value);
                         }
                         _ => (),
diff --git a/packages/rsx_interperter/src/interperter.rs b/packages/rsx_interperter/src/interperter.rs
index 159f060a9..a23dda040 100644
--- a/packages/rsx_interperter/src/interperter.rs
+++ b/packages/rsx_interperter/src/interperter.rs
@@ -1,7 +1,7 @@
 use dioxus_core::{Attribute, NodeFactory, VNode};
 use dioxus_rsx::{BodyNode, CallBody, ElementAttr};
-use quote::ToTokens;
 use std::str::FromStr;
+use syn::{parse_str, Expr};
 
 use crate::attributes::attrbute_to_static_str;
 use crate::captuered_context::{CapturedContext, IfmtArgs};
@@ -145,9 +145,10 @@ fn build_node<'a>(
 
                             _ => unreachable!(),
                         };
-                        let formatted_expr = format!("{}", value.to_token_stream());
-                        if let Some((_, resulting_value)) =
-                            ctx.expressions.iter().find(|(n, _)| *n == formatted_expr)
+                        if let Some((_, resulting_value)) = ctx
+                            .expressions
+                            .iter()
+                            .find(|(n, _)| parse_str::<Expr>(*n).unwrap() == value)
                         {
                             if let Some((name, namespace)) = attrbute_to_static_str(&name) {
                                 let value = bump.alloc(resulting_value.clone());
@@ -160,7 +161,7 @@ fn build_node<'a>(
                                 });
                             }
                         } else {
-                            panic!("could not resolve expression {}", formatted_expr);
+                            panic!("could not resolve expression {:?}", value);
                         }
                     }
                     // Path(ExprPath { attrs: [], qself: None, path: Path { leading_colon: None, segments: [PathSegment { ident: Ident { ident: \"count\", span: #0 bytes(497..502) }, arguments: None }] } })