Merge branch 'master' into jk/breaking-merged

packages/core/tests/create_fragments.rs

@@ -43,19 +43,19 @@ fn fragments_nested() {
         render!(
             div { "hello" }
             div { "goodbye" }
-            render! {
+            {render! {
                 div { "hello" }
                 div { "goodbye" }
-                render! {
+                {render! {
                     div { "hello" }
                     div { "goodbye" }
-                    render! {
+                    {render! {
                         div { "hello" }
                         div { "goodbye" }
-                    }
-                }
-            }
-        )
+                    }}
+                }}
+            }}
+        ))
     });
 
     assert_eq!(
@@ -77,7 +77,10 @@ fn fragments_across_components() {
 
     fn demo_child() -> Element {
         let world = "world";
-        render! { "hellO!", world }
+        render! {
+            "hellO!"
+            {world}
+        }
     }
 
     assert_eq!(
@@ -91,7 +94,7 @@ fn list_fragments() {
     fn app() -> Element {
         render!(
             h1 { "hello" }
-            (0..6).map(|f| render!( span { "{f}" }))
+            {(0..6).map(|f| render!( span { "{f}" }))}
         )
     }
     assert_eq!(

packages/core/tests/create_lists.rs

@@ -11,12 +11,12 @@ use dioxus_core::ElementId;
 fn app() -> Element {
     render! {
         div {
-            (0..3).map(|i| render! {
+            for i in 0..3 {
                 div {
                     h1 { "hello world! "}
                     p { "{i}" }
                 }
-            })
+            }
         }
     }
 }

packages/core/tests/create_passthru.rs

@@ -17,7 +17,7 @@ fn nested_passthru_creates() {
 
     #[component]
     fn PassThru(children: Element) -> Element {
-        render!(children)
+        render!({ children })
     }
 
     let mut dom = VirtualDom::new(app);
@@ -54,7 +54,7 @@ fn nested_passthru_creates_add() {
 
     #[component]
     fn ChildComp(children: Element) -> Element {
-        render! {children}
+        render! {{children}}
     }
 
     let mut dom = VirtualDom::new(app);

packages/core/tests/diff_component.rs

@@ -39,7 +39,7 @@ fn component_swap() {
 
     fn nav_bar() -> Element {
         render! {
-            h1 { "NavBar", (0..3).map(|_| render!(nav_link {})) }
+            h1 { "NavBar", {(0..3).map(|_| render!(nav_link {}))} }
         }
     }
 

packages/core/tests/diff_keyed_list.rs

@@ -17,7 +17,7 @@ fn keyed_diffing_out_of_order() {
             _ => unreachable!(),
         };
 
-        render!(order.iter().map(|i| render!(div { key: "{i}" })))
+        render!({ order.iter().map(|i| render!(div { key: "{i}" })) })
     });
 
     {
@@ -59,7 +59,7 @@ fn keyed_diffing_out_of_order_adds() {
             _ => unreachable!(),
         };
 
-        render!(order.iter().map(|i| render!(div { key: "{i}" })))
+        render!({ order.iter().map(|i| render!(div { key: "{i}" })) })
     });
 
     _ = dom.rebuild(&mut dioxus_core::NoOpMutations);
@@ -85,7 +85,7 @@ fn keyed_diffing_out_of_order_adds_3() {
             _ => unreachable!(),
         };
 
-        render!(order.iter().map(|i| render!(div { key: "{i}" })))
+        render!({ order.iter().map(|i| render!(div { key: "{i}" })) })
     });
 
     _ = dom.rebuild(&mut dioxus_core::NoOpMutations);
@@ -111,7 +111,7 @@ fn keyed_diffing_out_of_order_adds_4() {
             _ => unreachable!(),
         };
 
-        render!(order.iter().map(|i| render!(div { key: "{i}" })))
+        render!({ order.iter().map(|i| render!(div { key: "{i}" })) })
     });
 
     _ = dom.rebuild(&mut dioxus_core::NoOpMutations);
@@ -137,7 +137,7 @@ fn keyed_diffing_out_of_order_adds_5() {
             _ => unreachable!(),
         };
 
-        render!(order.iter().map(|i| render!(div { key: "{i}" })))
+        render!({ order.iter().map(|i| render!(div { key: "{i}" })) })
     });
 
     _ = dom.rebuild(&mut dioxus_core::NoOpMutations);
@@ -162,7 +162,7 @@ fn keyed_diffing_additions() {
             _ => unreachable!(),
         };
 
-        render!(order.iter().map(|i| render!(div { key: "{i}" })))
+        render!({ order.iter().map(|i| render!(div { key: "{i}" })) })
     });
 
     _ = dom.rebuild(&mut dioxus_core::NoOpMutations);
@@ -187,7 +187,7 @@ fn keyed_diffing_additions_and_moves_on_ends() {
             _ => unreachable!(),
         };
 
-        render!(order.iter().map(|i| render!(div { key: "{i}" })))
+        render!({ order.iter().map(|i| render!(div { key: "{i}" })) })
     });
 
     _ = dom.rebuild(&mut dioxus_core::NoOpMutations);
@@ -216,7 +216,7 @@ fn keyed_diffing_additions_and_moves_in_middle() {
             _ => unreachable!(),
         };
 
-        render!(order.iter().map(|i| render!(div { key: "{i}" })))
+        render!({ order.iter().map(|i| render!(div { key: "{i}" })) })
     });
 
     _ = dom.rebuild(&mut dioxus_core::NoOpMutations);
@@ -250,7 +250,7 @@ fn controlled_keyed_diffing_out_of_order() {
             _ => unreachable!(),
         };
 
-        render!(order.iter().map(|i| render!(div { key: "{i}" })))
+        render!({ order.iter().map(|i| render!(div { key: "{i}" })) })
     });
 
     _ = dom.rebuild(&mut dioxus_core::NoOpMutations);
@@ -284,7 +284,7 @@ fn controlled_keyed_diffing_out_of_order_max_test() {
             _ => unreachable!(),
         };
 
-        render!(order.iter().map(|i| render!(div { key: "{i}" })))
+        render!({ order.iter().map(|i| render!(div { key: "{i}" })) })
     });
 
     _ = dom.rebuild(&mut dioxus_core::NoOpMutations);
@@ -313,7 +313,7 @@ fn remove_list() {
             _ => unreachable!(),
         };
 
-        render!(order.iter().map(|i| render!(div { key: "{i}" })))
+        render!({ order.iter().map(|i| render!(div { key: "{i}" })) })
     });
 
     _ = dom.rebuild(&mut dioxus_core::NoOpMutations);
@@ -338,7 +338,7 @@ fn no_common_keys() {
             _ => unreachable!(),
         };
 
-        render!(order.iter().map(|i| render!(div { key: "{i}" })))
+        render!({ order.iter().map(|i| render!(div { key: "{i}" })) })
     });
 
     _ = dom.rebuild(&mut dioxus_core::NoOpMutations);

packages/core/tests/diff_unkeyed_list.rs

@@ -9,9 +9,9 @@ fn list_creates_one_by_one() {
 
         render! {
             div {
-                (0..gen).map(|i| render! {
+                for i in 0..gen {
                     div { "{i}" }
-                })
+                }
             }
         }
     });
@@ -78,9 +78,9 @@ fn removes_one_by_one() {
 
         render! {
             div {
-                (0..gen).map(|i| render! {
+                for i in 0..gen {
                     div { "{i}" }
-                })
+                }
             }
         }
     });
@@ -153,10 +153,10 @@ fn list_shrink_multiroot() {
     let mut dom = VirtualDom::new(|| {
         render! {
             div {
-                (0..generation()).map(|i| render! {
+                for i in 0..cx.generation() {
                     div { "{i}" }
                     div { "{i}" }
-                })
+                }
             }
         }
     });
@@ -214,10 +214,10 @@ fn removes_one_by_one_multiroot() {
 
         render! {
             div {
-                (0..gen).map(|i| render! {
+                {(0..gen).map(|i| rsx! {
                     div { "{i}" }
                     div { "{i}" }
-                })
+                })}
             }
         }
     });
@@ -276,9 +276,9 @@ fn removes_one_by_one_multiroot() {
 fn two_equal_fragments_are_equal_static() {
     let mut dom = VirtualDom::new(|| {
         render! {
-            (0..5).map(|_| render! {
+            for _ in 0..5 {
                 div { "hello" }
-            })
+            }
         }
     });
 
@@ -290,9 +290,9 @@ fn two_equal_fragments_are_equal_static() {
 fn two_equal_fragments_are_equal() {
     let mut dom = VirtualDom::new(|| {
         render! {
-            (0..5).map(|i| render! {
+            for i in 0..5 {
                 div { "hello {i}" }
-            })
+            }
         }
     });
 
@@ -310,7 +310,11 @@ fn remove_many() {
             _ => unreachable!(),
         };
 
-        render! {(0..num).map(|i| render! { div { "hello {i}" } })}
+        render! {
+            for i in 0..num {
+                div { "hello {i}" }
+            }
+        }
     });
 
     {

packages/core/tests/event_propagation.rs

@@ -58,11 +58,11 @@ fn app() -> Element {
                 *CLICKS.lock().unwrap() += 1;
             },
 
-            vec![
+            {vec![
                 render! {
                     problematic_child {}
                 }
-            ].into_iter()
+            ].into_iter()}
         }
     }
 }

packages/core/tests/fuzzing.rs

@@ -218,6 +218,7 @@ fn create_random_dynamic_attr() -> Attribute {
         random_ns(),
         rand::random(),
     )
+    .into()
 }
 
 static mut TEMPLATE_COUNT: usize = 0;
@@ -249,7 +250,9 @@ fn create_random_element(cx: DepthProps) -> Element {
                 )
                 .into_boxed_str(),
             ));
-            let node = VNode::new(
+            println!("{template:#?}");
+            let node = cx.vnode(
+                None.into(),
                 None,
                 template,
                 dynamic_node_types

packages/core/tests/lifecycle.rs

@@ -52,7 +52,7 @@ fn events_generate() {
                     "Click me!"
                 }
             },
-            _ => render!(()),
+            _ => None,
         }
     };
 

packages/core/tests/miri_full_app.rs

@@ -38,9 +38,9 @@ fn app() -> Element {
             }
             button { onclick: move |_| idx -= 1, "-" }
             ul {
-                (0..*idx()).map(|i| render! {
+                {(0..**idx).map(|i| rsx! {
                     ChildExample { i: i, onhover: onhover }
-                })
+                })}
             }
         }
     }

packages/core/tests/miri_stress.rs

@@ -15,7 +15,7 @@ fn test_memory_leak() {
         spawn(async {});
 
         if val == 2 || val == 4 {
-            return render!(());
+            return render!({});
         }
 
         let mut name = once(|| String::from("numbers: "));
@@ -73,7 +73,7 @@ fn memo_works_properly() {
         let val = generation();
 
         if val == 2 || val == 4 {
-            return render!(());
+            return None;
         }
 
         let name = once(|| String::from("asd"));