Merge branch 'master' into jk/add-miri-to-ci

packages/core/tests/attr_cleanup.rs

@@ -2,8 +2,10 @@
 //!
 //! This tests to ensure we clean it up
 
+use bumpalo::Bump;
 use dioxus::core::{ElementId, Mutation::*};
 use dioxus::prelude::*;
+use dioxus_core::{AttributeValue, BorrowedAttributeValue};
 
 #[test]
 fn attrs_cycle() {
@@ -22,6 +24,8 @@ fn attrs_cycle() {
         }
     });
 
+    let bump = Bump::new();
+
     assert_eq!(
         dom.rebuild().santize().edits,
         [
@@ -36,8 +40,18 @@ fn attrs_cycle() {
         [
             LoadTemplate { name: "template", index: 0, id: ElementId(2,) },
             AssignId { path: &[0,], id: ElementId(3,) },
-            SetAttribute { name: "class", value: "1", id: ElementId(3,), ns: None },
-            SetAttribute { name: "id", value: "1", id: ElementId(3,), ns: None },
+            SetAttribute {
+                name: "class",
+                value: (&*bump.alloc("1".into_value(&bump))).into(),
+                id: ElementId(3,),
+                ns: None
+            },
+            SetAttribute {
+                name: "id",
+                value: (&*bump.alloc("1".into_value(&bump))).into(),
+                id: ElementId(3,),
+                ns: None
+            },
             ReplaceWith { id: ElementId(1,), m: 1 },
         ]
     );
@@ -57,8 +71,18 @@ fn attrs_cycle() {
         [
             LoadTemplate { name: "template", index: 0, id: ElementId(2) },
             AssignId { path: &[0], id: ElementId(3) },
-            SetAttribute { name: "class", value: "3", id: ElementId(3), ns: None },
-            SetAttribute { name: "id", value: "3", id: ElementId(3), ns: None },
+            SetAttribute {
+                name: "class",
+                value: BorrowedAttributeValue::Text("3"),
+                id: ElementId(3),
+                ns: None
+            },
+            SetAttribute {
+                name: "id",
+                value: BorrowedAttributeValue::Text("3"),
+                id: ElementId(3),
+                ns: None
+            },
             ReplaceWith { id: ElementId(1), m: 1 }
         ]
     );

packages/core/tests/boolattrs.rs

@@ -1,15 +1,23 @@
+use bumpalo::Bump;
 use dioxus::core::{ElementId, Mutation::*};
 use dioxus::prelude::*;
 
 #[test]
 fn bool_test() {
     let mut app = VirtualDom::new(|cx| cx.render(rsx!(div { hidden: false })));
+    let bump = Bump::new();
+
     assert_eq!(
         app.rebuild().santize().edits,
         [
             LoadTemplate { name: "template", index: 0, id: ElementId(1) },
-            SetBoolAttribute { name: "hidden", value: false, id: ElementId(1,) },
+            SetAttribute {
+                name: "hidden",
+                value: (&*bump.alloc(false.into_value(&bump))).into(),
+                id: ElementId(1,),
+                ns: None
+            },
             AppendChildren { m: 1, id: ElementId(0) },
         ]
-    )
+    );
 }

packages/core/tests/borrowedstate.rs

@@ -18,7 +18,7 @@ fn test_borrowed_state() {
             ReplacePlaceholder { path: &[0,], m: 1 },
             AppendChildren { m: 1, id: ElementId(0) },
         ]
-    )
+    );
 }
 
 fn Parent(cx: Scope) -> Element {

packages/core/tests/bubble_error.rs

@@ -20,7 +20,9 @@ fn app(cx: Scope) -> Element {
 fn bubbles_error() {
     let mut dom = VirtualDom::new(app);
 
-    let _edits = dom.rebuild().santize();
+    {
+        let _edits = dom.rebuild().santize();
+    }
 
     dom.mark_dirty(ScopeId(0));
 

packages/core/tests/cycle.rs

@@ -12,14 +12,16 @@ fn cycling_elements() {
         })
     });
 
-    let edits = dom.rebuild().santize();
-    assert_eq!(
-        edits.edits,
-        [
-            LoadTemplate { name: "template", index: 0, id: ElementId(1,) },
-            AppendChildren { m: 1, id: ElementId(0) },
-        ]
-    );
+    {
+        let edits = dom.rebuild().santize();
+        assert_eq!(
+            edits.edits,
+            [
+                LoadTemplate { name: "template", index: 0, id: ElementId(1,) },
+                AppendChildren { m: 1, id: ElementId(0) },
+            ]
+        );
+    }
 
     dom.mark_dirty(ScopeId(0));
     assert_eq!(

packages/core/tests/diff_component.rs

@@ -59,19 +59,21 @@ fn component_swap() {
     }
 
     let mut dom = VirtualDom::new(app);
-    let edits = dom.rebuild().santize();
-    assert_eq!(
-        edits.edits,
-        [
-            LoadTemplate { name: "template", index: 0, id: ElementId(1) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(2) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(3) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(4) },
-            ReplacePlaceholder { path: &[1], m: 3 },
-            LoadTemplate { name: "template", index: 0, id: ElementId(5) },
-            AppendChildren { m: 2, id: ElementId(0) }
-        ]
-    );
+    {
+        let edits = dom.rebuild().santize();
+        assert_eq!(
+            edits.edits,
+            [
+                LoadTemplate { name: "template", index: 0, id: ElementId(1) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(2) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(3) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(4) },
+                ReplacePlaceholder { path: &[1], m: 3 },
+                LoadTemplate { name: "template", index: 0, id: ElementId(5) },
+                AppendChildren { m: 2, id: ElementId(0) }
+            ]
+        );
+    }
 
     dom.mark_dirty(ScopeId(0));
     assert_eq!(

packages/core/tests/diff_keyed_list.rs

@@ -20,22 +20,24 @@ fn keyed_diffing_out_of_order() {
         cx.render(rsx!(order.iter().map(|i| rsx!(div { key: "{i}" }))))
     });
 
-    assert_eq!(
-        dom.rebuild().santize().edits,
-        [
-            LoadTemplate { name: "template", index: 0, id: ElementId(1,) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(2,) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(3,) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(4,) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(5,) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(6,) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(7,) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(8,) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(9,) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(10,) },
-            AppendChildren { m: 10, id: ElementId(0) },
-        ]
-    );
+    {
+        assert_eq!(
+            dom.rebuild().santize().edits,
+            [
+                LoadTemplate { name: "template", index: 0, id: ElementId(1,) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(2,) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(3,) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(4,) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(5,) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(6,) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(7,) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(8,) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(9,) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(10,) },
+                AppendChildren { m: 10, id: ElementId(0) },
+            ]
+        );
+    }
 
     dom.mark_dirty(ScopeId(0));
     assert_eq!(
@@ -44,7 +46,7 @@ fn keyed_diffing_out_of_order() {
             PushRoot { id: ElementId(7,) },
             InsertBefore { id: ElementId(5,), m: 1 },
         ]
-    )
+    );
 }
 
 /// Should result in moves only
@@ -70,7 +72,7 @@ fn keyed_diffing_out_of_order_adds() {
             PushRoot { id: ElementId(4,) },
             InsertBefore { id: ElementId(1,), m: 2 },
         ]
-    )
+    );
 }
 
 /// Should result in moves only

packages/core/tests/diff_unkeyed_list.rs

@@ -315,66 +315,76 @@ fn remove_many() {
         })
     });
 
-    let edits = dom.rebuild().santize();
-    assert!(edits.templates.is_empty());
-    assert_eq!(
-        edits.edits,
-        [
-            CreatePlaceholder { id: ElementId(1,) },
-            AppendChildren { id: ElementId(0), m: 1 },
-        ]
-    );
+    {
+        let edits = dom.rebuild().santize();
+        assert!(edits.templates.is_empty());
+        assert_eq!(
+            edits.edits,
+            [
+                CreatePlaceholder { id: ElementId(1,) },
+                AppendChildren { id: ElementId(0), m: 1 },
+            ]
+        );
+    }
 
-    dom.mark_dirty(ScopeId(0));
-    let edits = dom.render_immediate().santize();
-    assert_eq!(
-        edits.edits,
-        [
-            LoadTemplate { name: "template", index: 0, id: ElementId(2,) },
-            HydrateText { path: &[0,], value: "hello 0", id: ElementId(3,) },
-            ReplaceWith { id: ElementId(1,), m: 1 },
-        ]
-    );
+    {
+        dom.mark_dirty(ScopeId(0));
+        let edits = dom.render_immediate().santize();
+        assert_eq!(
+            edits.edits,
+            [
+                LoadTemplate { name: "template", index: 0, id: ElementId(2,) },
+                HydrateText { path: &[0,], value: "hello 0", id: ElementId(3,) },
+                ReplaceWith { id: ElementId(1,), m: 1 },
+            ]
+        );
+    }
 
-    dom.mark_dirty(ScopeId(0));
-    let edits = dom.render_immediate().santize();
-    assert_eq!(
-        edits.edits,
-        [
-            LoadTemplate { name: "template", index: 0, id: ElementId(1,) },
-            HydrateText { path: &[0,], value: "hello 1", id: ElementId(4,) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(5,) },
-            HydrateText { path: &[0,], value: "hello 2", id: ElementId(6,) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(7,) },
-            HydrateText { path: &[0,], value: "hello 3", id: ElementId(8,) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(9,) },
-            HydrateText { path: &[0,], value: "hello 4", id: ElementId(10,) },
-            InsertAfter { id: ElementId(2,), m: 4 },
-        ]
-    );
+    {
+        dom.mark_dirty(ScopeId(0));
+        let edits = dom.render_immediate().santize();
+        assert_eq!(
+            edits.edits,
+            [
+                LoadTemplate { name: "template", index: 0, id: ElementId(1,) },
+                HydrateText { path: &[0,], value: "hello 1", id: ElementId(4,) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(5,) },
+                HydrateText { path: &[0,], value: "hello 2", id: ElementId(6,) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(7,) },
+                HydrateText { path: &[0,], value: "hello 3", id: ElementId(8,) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(9,) },
+                HydrateText { path: &[0,], value: "hello 4", id: ElementId(10,) },
+                InsertAfter { id: ElementId(2,), m: 4 },
+            ]
+        );
+    }
 
-    dom.mark_dirty(ScopeId(0));
-    let edits = dom.render_immediate().santize();
-    assert_eq!(
-        edits.edits,
-        [
-            CreatePlaceholder { id: ElementId(11,) },
-            Remove { id: ElementId(9,) },
-            Remove { id: ElementId(7,) },
-            Remove { id: ElementId(5,) },
-            Remove { id: ElementId(1,) },
-            ReplaceWith { id: ElementId(2,), m: 1 },
-        ]
-    );
+    {
+        dom.mark_dirty(ScopeId(0));
+        let edits = dom.render_immediate().santize();
+        assert_eq!(
+            edits.edits,
+            [
+                CreatePlaceholder { id: ElementId(11,) },
+                Remove { id: ElementId(9,) },
+                Remove { id: ElementId(7,) },
+                Remove { id: ElementId(5,) },
+                Remove { id: ElementId(1,) },
+                ReplaceWith { id: ElementId(2,), m: 1 },
+            ]
+        );
+    }
 
-    dom.mark_dirty(ScopeId(0));
-    let edits = dom.render_immediate().santize();
-    assert_eq!(
-        edits.edits,
-        [
-            LoadTemplate { name: "template", index: 0, id: ElementId(2,) },
-            HydrateText { path: &[0,], value: "hello 0", id: ElementId(3,) },
-            ReplaceWith { id: ElementId(11,), m: 1 },
-        ]
-    )
+    {
+        dom.mark_dirty(ScopeId(0));
+        let edits = dom.render_immediate().santize();
+        assert_eq!(
+            edits.edits,
+            [
+                LoadTemplate { name: "template", index: 0, id: ElementId(2,) },
+                HydrateText { path: &[0,], value: "hello 0", id: ElementId(3,) },
+                ReplaceWith { id: ElementId(11,), m: 1 },
+            ]
+        )
+    }
 }

packages/core/tests/kitchen_sink.rs

@@ -1,3 +1,4 @@
+use bumpalo::Bump;
 use dioxus::core::{ElementId, Mutation};
 use dioxus::prelude::*;
 
@@ -26,17 +27,22 @@ fn basic_syntax_is_a_template(cx: Scope) -> Element {
 #[test]
 fn dual_stream() {
     let mut dom = VirtualDom::new(basic_syntax_is_a_template);
+    let bump = Bump::new();
     let edits = dom.rebuild().santize();
 
     use Mutation::*;
-    assert_eq!(
-        edits.edits,
+    assert_eq!(edits.edits, {
         [
             LoadTemplate { name: "template", index: 0, id: ElementId(1) },
-            SetAttribute { name: "class", value: "123", id: ElementId(1), ns: None },
+            SetAttribute {
+                name: "class",
+                value: (&*bump.alloc("123".into_value(&bump))).into(),
+                id: ElementId(1),
+                ns: None,
+            },
             NewEventListener { name: "click", id: ElementId(1) },
             HydrateText { path: &[0, 0], value: "123", id: ElementId(2) },
-            AppendChildren { id: ElementId(0), m: 1 }
-        ],
-    );
+            AppendChildren { id: ElementId(0), m: 1 },
+        ]
+    });
 }

packages/core/tests/suspense.rs

@@ -5,40 +5,48 @@ use std::future::IntoFuture;
 use std::rc::Rc;
 use std::time::Duration;
 
-#[tokio::test]
-async fn it_works() {
-    let mut dom = VirtualDom::new(app);
-
-    let mutations = dom.rebuild().santize();
-
-    // We should at least get the top-level template in before pausing for the children
-    // note: we dont test template edits anymore
-    // assert_eq!(
-    //     mutations.templates,
-    //     [
-    //         CreateElement { name: "div" },
-    //         CreateStaticText { value: "Waiting for child..." },
-    //         CreateStaticPlaceholder,
-    //         AppendChildren { m: 2 },
-    //         SaveTemplate { name: "template", m: 1 }
-    //     ]
-    // );
-
-    // And we should load it in and assign the placeholder properly
-    assert_eq!(
-        mutations.edits,
-        [
-            LoadTemplate { name: "template", index: 0, id: ElementId(1) },
-            // hmmmmmmmmm.... with suspense how do we guarantee that IDs increase linearly?
-            // can we even?
-            AssignId { path: &[1], id: ElementId(3) },
-            AppendChildren { m: 1, id: ElementId(0) },
-        ]
-    );
-
+#[test]
+fn it_works() {
     // wait just a moment, not enough time for the boundary to resolve
 
-    dom.wait_for_work().await;
+    tokio::runtime::Builder::new_current_thread()
+        .enable_time()
+        .build()
+        .unwrap()
+        .block_on(async {
+            let mut dom = VirtualDom::new(app);
+
+            {
+                let mutations = dom.rebuild().santize();
+
+                // We should at least get the top-level template in before pausing for the children
+                // note: we dont test template edits anymore
+                // assert_eq!(
+                //     mutations.templates,
+                //     [
+                //         CreateElement { name: "div" },
+                //         CreateStaticText { value: "Waiting for child..." },
+                //         CreateStaticPlaceholder,
+                //         AppendChildren { m: 2 },
+                //         SaveTemplate { name: "template", m: 1 }
+                //     ]
+                // );
+
+                // And we should load it in and assign the placeholder properly
+                assert_eq!(
+                    mutations.edits,
+                    [
+                        LoadTemplate { name: "template", index: 0, id: ElementId(1) },
+                        // hmmmmmmmmm.... with suspense how do we guarantee that IDs increase linearly?
+                        // can we even?
+                        AssignId { path: &[1], id: ElementId(3) },
+                        AppendChildren { m: 1, id: ElementId(0) },
+                    ]
+                );
+            }
+
+            dom.wait_for_work().await;
+        });
 }
 
 fn app(cx: Scope) -> Element {