fmt: make tests easier to visually parse with fmt rules

packages/core/tests/.rustfmt.toml

@@ -0,0 +1 @@
+struct_lit_width = 80

packages/core/tests/create_dom.rs

@@ -36,18 +36,9 @@ fn test_original_diff() {
     assert_eq!(
         mutations.edits,
         [
-            CreateElement {
+            CreateElement { root: 1, tag: "div" },
-                root: 1,
+            CreateElement { root: 2, tag: "div" },
-                tag: "div"
+            CreateTextNode { root: 3, text: "Hello, world!" },
-            },
-            CreateElement {
-                root: 2,
-                tag: "div"
-            },
-            CreateTextNode {
-                root: 3,
-                text: "Hello, world!"
-            },
             AppendChildren { many: 1 },
             AppendChildren { many: 1 },
             AppendChildren { many: 1 },
@@ -81,34 +72,13 @@ fn create() {
     assert_eq!(
         mutations.edits,
         [
-            CreateElement {
+            CreateElement { root: 1, tag: "div" },
-                root: 1,
+            CreateElement { root: 2, tag: "div" },
-                tag: "div"
+            CreateTextNode { root: 3, text: "Hello, world!" },
-            },
+            CreateElement { root: 4, tag: "div" },
-            CreateElement {
+            CreateElement { root: 5, tag: "div" },
-                root: 2,
+            CreateTextNode { root: 6, text: "hello" },
-                tag: "div"
+            CreateTextNode { root: 7, text: "world" },
-            },
-            CreateTextNode {
-                root: 3,
-                text: "Hello, world!"
-            },
-            CreateElement {
-                root: 4,
-                tag: "div"
-            },
-            CreateElement {
-                root: 5,
-                tag: "div"
-            },
-            CreateTextNode {
-                root: 6,
-                text: "hello"
-            },
-            CreateTextNode {
-                root: 7,
-                text: "world"
-            },
             AppendChildren { many: 2 },
             AppendChildren { many: 1 },
             AppendChildren { many: 2 },
@@ -135,32 +105,14 @@ fn create_list() {
     assert_eq!(
         mutations.edits,
         [
-            CreateElement {
+            CreateElement { root: 1, tag: "div" },
-                root: 1,
+            CreateTextNode { root: 2, text: "hello" },
-                tag: "div"
-            },
-            CreateTextNode {
-                root: 2,
-                text: "hello"
-            },
             AppendChildren { many: 1 },
-            CreateElement {
+            CreateElement { root: 3, tag: "div" },
-                root: 3,
+            CreateTextNode { root: 4, text: "hello" },
-                tag: "div"
-            },
-            CreateTextNode {
-                root: 4,
-                text: "hello"
-            },
             AppendChildren { many: 1 },
-            CreateElement {
+            CreateElement { root: 5, tag: "div" },
-                root: 5,
+            CreateTextNode { root: 6, text: "hello" },
-                tag: "div"
-            },
-            CreateTextNode {
-                root: 6,
-                text: "hello"
-            },
             AppendChildren { many: 1 },
             AppendChildren { many: 3 },
         ]
@@ -185,22 +137,10 @@ fn create_simple() {
     assert_eq!(
         mutations.edits,
         [
-            CreateElement {
+            CreateElement { root: 1, tag: "div" },
-                root: 1,
+            CreateElement { root: 2, tag: "div" },
-                tag: "div"
+            CreateElement { root: 3, tag: "div" },
-            },
+            CreateElement { root: 4, tag: "div" },
-            CreateElement {
-                root: 2,
-                tag: "div"
-            },
-            CreateElement {
-                root: 3,
-                tag: "div"
-            },
-            CreateElement {
-                root: 4,
-                tag: "div"
-            },
             AppendChildren { many: 4 },
         ]
     );
@@ -235,36 +175,18 @@ fn create_components() {
         mutations.edits,
         [
             CreateElement { root: 1, tag: "h1" },
-            CreateElement {
+            CreateElement { root: 2, tag: "div" },
-                root: 2,
+            CreateTextNode { root: 3, text: "abc1" },
-                tag: "div"
-            },
-            CreateTextNode {
-                root: 3,
-                text: "abc1"
-            },
             AppendChildren { many: 1 },
             CreateElement { root: 4, tag: "p" },
             CreateElement { root: 5, tag: "h1" },
-            CreateElement {
+            CreateElement { root: 6, tag: "div" },
-                root: 6,
+            CreateTextNode { root: 7, text: "abc2" },
-                tag: "div"
-            },
-            CreateTextNode {
-                root: 7,
-                text: "abc2"
-            },
             AppendChildren { many: 1 },
             CreateElement { root: 8, tag: "p" },
             CreateElement { root: 9, tag: "h1" },
-            CreateElement {
+            CreateElement { root: 10, tag: "div" },
-                root: 10,
+            CreateTextNode { root: 11, text: "abc3" },
-                tag: "div"
-            },
-            CreateTextNode {
-                root: 11,
-                text: "abc3"
-            },
             AppendChildren { many: 1 },
             CreateElement { root: 12, tag: "p" },
             AppendChildren { many: 9 },
@@ -285,14 +207,8 @@ fn anchors() {
     assert_eq!(
         mutations.edits,
         [
-            CreateElement {
+            CreateElement { root: 1, tag: "div" },
-                root: 1,
+            CreateTextNode { root: 2, text: "hello" },
-                tag: "div"
-            },
-            CreateTextNode {
-                root: 2,
-                text: "hello"
-            },
             AppendChildren { many: 1 },
             CreatePlaceholder { root: 3 },
             AppendChildren { many: 2 },

packages/core/tests/diffing.rs

@@ -31,26 +31,14 @@ fn html_and_rsx_generate_the_same_output() {
     assert_eq!(
         create.edits,
         [
-            CreateElement {
+            CreateElement { root: 1, tag: "div" },
-                root: 1,
+            CreateTextNode { root: 2, text: "Hello world" },
-                tag: "div"
-            },
-            CreateTextNode {
-                root: 2,
-                text: "Hello world"
-            },
             AppendChildren { many: 1 },
             AppendChildren { many: 1 },
         ]
     );
 
-    assert_eq!(
+    assert_eq!(change.edits, [SetText { text: "Goodbye world", root: 2 },]);
-        change.edits,
-        [SetText {
-            text: "Goodbye world",
-            root: 2
-        },]
-    );
 }
 
 /// Should result in 3 elements on the stack
@@ -67,32 +55,14 @@ fn fragments_create_properly() {
     assert_eq!(
         create.edits,
         [
-            CreateElement {
+            CreateElement { root: 1, tag: "div" },
-                root: 1,
+            CreateTextNode { root: 2, text: "Hello a" },
-                tag: "div"
-            },
-            CreateTextNode {
-                root: 2,
-                text: "Hello a"
-            },
             AppendChildren { many: 1 },
-            CreateElement {
+            CreateElement { root: 3, tag: "div" },
-                root: 3,
+            CreateTextNode { root: 4, text: "Hello b" },
-                tag: "div"
-            },
-            CreateTextNode {
-                root: 4,
-                text: "Hello b"
-            },
             AppendChildren { many: 1 },
-            CreateElement {
+            CreateElement { root: 5, tag: "div" },
-                root: 5,
+            CreateTextNode { root: 6, text: "Hello c" },
-                tag: "div"
-            },
-            CreateTextNode {
-                root: 6,
-                text: "Hello c"
-            },
             AppendChildren { many: 1 },
             AppendChildren { many: 3 },
         ]
@@ -116,10 +86,7 @@ fn empty_fragments_create_anchors() {
     assert_eq!(
         change.edits,
         [
-            CreateElement {
+            CreateElement { root: 2, tag: "div" },
-                root: 2,
-                tag: "div"
-            },
             ReplaceWith { m: 1, root: 1 }
         ]
     );
@@ -141,26 +108,11 @@ fn empty_fragments_create_many_anchors() {
     assert_eq!(
         change.edits,
         [
-            CreateElement {
+            CreateElement { root: 2, tag: "div" },
-                root: 2,
+            CreateElement { root: 3, tag: "div" },
-                tag: "div"
+            CreateElement { root: 4, tag: "div" },
-            },
+            CreateElement { root: 5, tag: "div" },
-            CreateElement {
+            CreateElement { root: 6, tag: "div" },
-                root: 3,
-                tag: "div"
-            },
-            CreateElement {
-                root: 4,
-                tag: "div"
-            },
-            CreateElement {
-                root: 5,
-                tag: "div"
-            },
-            CreateElement {
-                root: 6,
-                tag: "div"
-            },
             ReplaceWith { m: 5, root: 1 }
         ]
     );
@@ -188,32 +140,14 @@ fn empty_fragments_create_anchors_with_many_children() {
     assert_eq!(
         change.edits,
         [
-            CreateElement {
+            CreateElement { tag: "div", root: 2 },
-                tag: "div",
+            CreateTextNode { text: "hello: 0", root: 3 },
-                root: 2,
-            },
-            CreateTextNode {
-                text: "hello: 0",
-                root: 3
-            },
             AppendChildren { many: 1 },
-            CreateElement {
+            CreateElement { tag: "div", root: 4 },
-                tag: "div",
+            CreateTextNode { text: "hello: 1", root: 5 },
-                root: 4,
-            },
-            CreateTextNode {
-                text: "hello: 1",
-                root: 5
-            },
             AppendChildren { many: 1 },
-            CreateElement {
+            CreateElement { tag: "div", root: 6 },
-                tag: "div",
+            CreateTextNode { text: "hello: 2", root: 7 },
-                root: 6,
-            },
-            CreateTextNode {
-                text: "hello: 2",
-                root: 7
-            },
             AppendChildren { many: 1 },
             ReplaceWith { root: 1, m: 3 }
         ]
@@ -236,23 +170,11 @@ fn many_items_become_fragment() {
     assert_eq!(
         create.edits,
         [
-            CreateElement {
+            CreateElement { root: 1, tag: "div" },
-                root: 1,
+            CreateTextNode { text: "hello", root: 2 },
-                tag: "div"
-            },
-            CreateTextNode {
-                text: "hello",
-                root: 2
-            },
             AppendChildren { many: 1 },
-            CreateElement {
+            CreateElement { root: 3, tag: "div" },
-                root: 3,
+            CreateTextNode { text: "hello", root: 4 },
-                tag: "div"
-            },
-            CreateTextNode {
-                text: "hello",
-                root: 4
-            },
             AppendChildren { many: 1 },
             AppendChildren { many: 2 },
         ]
@@ -339,26 +261,11 @@ fn two_fragments_with_differrent_elements_are_differet_shorter() {
     assert_eq!(
         create.edits,
         [
-            CreateElement {
+            CreateElement { root: 1, tag: "div" },
-                root: 1,
+            CreateElement { root: 2, tag: "div" },
-                tag: "div"
+            CreateElement { root: 3, tag: "div" },
-            },
+            CreateElement { root: 4, tag: "div" },
-            CreateElement {
+            CreateElement { root: 5, tag: "div" },
-                root: 2,
-                tag: "div"
-            },
-            CreateElement {
-                root: 3,
-                tag: "div"
-            },
-            CreateElement {
-                root: 4,
-                tag: "div"
-            },
-            CreateElement {
-                root: 5,
-                tag: "div"
-            },
             CreateElement { root: 6, tag: "p" },
             AppendChildren { many: 6 },
         ]
@@ -395,14 +302,8 @@ fn two_fragments_with_same_elements_are_differet() {
     assert_eq!(
         create.edits,
         [
-            CreateElement {
+            CreateElement { root: 1, tag: "div" },
-                root: 1,
+            CreateElement { root: 2, tag: "div" },
-                tag: "div"
-            },
-            CreateElement {
-                root: 2,
-                tag: "div"
-            },
             CreateElement { root: 3, tag: "p" },
             AppendChildren { many: 3 },
         ]
@@ -410,18 +311,9 @@ fn two_fragments_with_same_elements_are_differet() {
     assert_eq!(
         change.edits,
         [
-            CreateElement {
+            CreateElement { root: 4, tag: "div" },
-                root: 4,
+            CreateElement { root: 5, tag: "div" },
-                tag: "div"
+            CreateElement { root: 6, tag: "div" },
-            },
-            CreateElement {
-                root: 5,
-                tag: "div"
-            },
-            CreateElement {
-                root: 6,
-                tag: "div"
-            },
             InsertAfter { root: 2, n: 3 },
         ]
     );
@@ -628,14 +520,8 @@ fn keyed_diffing_additions() {
     assert_eq!(
         change.edits,
         [
-            CreateElement {
+            CreateElement { root: 6, tag: "div" },
-                root: 6,
+            CreateElement { root: 7, tag: "div" },
-                tag: "div"
-            },
-            CreateElement {
-                root: 7,
-                tag: "div"
-            },
             InsertAfter { n: 2, root: 5 }
         ]
     );
@@ -663,14 +549,8 @@ fn keyed_diffing_additions_and_moves_on_ends() {
         change.edits,
         [
             // create 11, 12
-            CreateElement {
+            CreateElement { tag: "div", root: 5 },
-                tag: "div",
+            CreateElement { tag: "div", root: 6 },
-                root: 5
-            },
-            CreateElement {
-                tag: "div",
-                root: 6
-            },
             InsertAfter { root: 3, n: 2 },
             // move 7 to the front
             PushRoot { root: 4 },
@@ -702,24 +582,12 @@ fn keyed_diffing_additions_and_moves_in_middle() {
         change.edits,
         [
             // create 13, 17
-            CreateElement {
+            CreateElement { tag: "div", root: 5 },
-                tag: "div",
+            CreateElement { tag: "div", root: 6 },
-                root: 5
-            },
-            CreateElement {
-                tag: "div",
-                root: 6
-            },
             InsertBefore { root: 2, n: 2 },
             // create 11, 12
-            CreateElement {
+            CreateElement { tag: "div", root: 7 },
-                tag: "div",
+            CreateElement { tag: "div", root: 8 },
-                root: 7
-            },
-            CreateElement {
-                tag: "div",
-                root: 8
-            },
             InsertBefore { root: 3, n: 2 },
             // move 7
             PushRoot { root: 4 },
@@ -756,16 +624,10 @@ fn controlled_keyed_diffing_out_of_order() {
             // remove 7
 
             // create 9 and insert before 6
-            CreateElement {
+            CreateElement { root: 5, tag: "div" },
-                root: 5,
-                tag: "div"
-            },
             InsertBefore { n: 1, root: 3 },
             // create 0 and insert before 5
-            CreateElement {
+            CreateElement { root: 6, tag: "div" },
-                root: 6,
-                tag: "div"
-            },
             InsertBefore { n: 1, root: 2 },
         ]
     );
@@ -792,10 +654,7 @@ fn controlled_keyed_diffing_out_of_order_max_test() {
     assert_eq!(
         changes.edits,
         [
-            CreateElement {
+            CreateElement { root: 6, tag: "div" },
-                root: 6,
-                tag: "div"
-            },
             InsertBefore { n: 1, root: 3 },
             PushRoot { root: 4 },
             InsertBefore { n: 1, root: 1 },

packages/core/tests/earlyabort.rs

@@ -42,14 +42,8 @@ fn test_early_abort() {
     assert_eq!(
         edits.edits,
         [
-            CreateElement {
+            CreateElement { tag: "div", root: 1 },
-                tag: "div",
+            CreateTextNode { text: "Hello, world!", root: 2 },
-                root: 1,
-            },
-            CreateTextNode {
-                text: "Hello, world!",
-                root: 2,
-            },
             AppendChildren { many: 1 },
             AppendChildren { many: 1 },
         ]
@@ -65,14 +59,8 @@ fn test_early_abort() {
     assert_eq!(
         edits.edits,
         [
-            CreateElement {
+            CreateElement { tag: "div", root: 2 },
-                tag: "div",
+            CreateTextNode { text: "Hello, world!", root: 4 },
-                root: 2,
-            },
-            CreateTextNode {
-                text: "Hello, world!",
-                root: 4,
-            },
             AppendChildren { many: 1 },
             ReplaceWith { root: 3, m: 1 },
         ]

packages/core/tests/lifecycle.rs

@@ -27,12 +27,7 @@ fn manual_diffing() {
     };
 
     let value = Arc::new(Mutex::new("Hello"));
-    let mut dom = VirtualDom::new_with_props(
+    let mut dom = VirtualDom::new_with_props(App, AppProps { value: value.clone() });
-        App,
-        AppProps {
-            value: value.clone(),
-        },
-    );
 
     let _ = dom.rebuild();
 
@@ -74,28 +69,12 @@ fn events_generate() {
     assert_eq!(
         edits.edits,
         [
-            CreateElement {
+            CreateElement { tag: "div", root: 1 },
-                tag: "div",
+            NewEventListener { event_name: "click", scope: ScopeId(0), root: 1 },
-                root: 1,
+            CreateElement { tag: "div", root: 2 },
-            },
+            CreateTextNode { text: "nested", root: 3 },
-            NewEventListener {
-                event_name: "click",
-                scope: ScopeId(0),
-                root: 1,
-            },
-            CreateElement {
-                tag: "div",
-                root: 2,
-            },
-            CreateTextNode {
-                text: "nested",
-                root: 3,
-            },
             AppendChildren { many: 1 },
-            CreateTextNode {
+            CreateTextNode { text: "Click me!", root: 4 },
-                text: "Click me!",
-                root: 4,
-            },
             AppendChildren { many: 2 },
             AppendChildren { many: 1 },
         ]
@@ -132,10 +111,7 @@ fn components_generate() {
     assert_eq!(
         edits.edits,
         [
-            CreateTextNode {
+            CreateTextNode { text: "Text0", root: 1 },
-                text: "Text0",
-                root: 1,
-            },
             AppendChildren { many: 1 },
         ]
     );
@@ -144,10 +120,7 @@ fn components_generate() {
     assert_eq!(
         edits.edits,
         [
-            CreateElement {
+            CreateElement { tag: "div", root: 2 },
-                tag: "div",
-                root: 2,
-            },
             ReplaceWith { root: 1, m: 1 },
         ]
     );
@@ -156,10 +129,7 @@ fn components_generate() {
     assert_eq!(
         edits.edits,
         [
-            CreateTextNode {
+            CreateTextNode { text: "Text2", root: 3 },
-                text: "Text2",
-                root: 3,
-            },
             ReplaceWith { root: 2, m: 1 },
         ]
     );
@@ -183,10 +153,7 @@ fn components_generate() {
     assert_eq!(
         edits.edits,
         [
-            CreateTextNode {
+            CreateTextNode { text: "text 3", root: 6 },
-                text: "text 3",
-                root: 6,
-            },
             ReplaceWith { root: 5, m: 1 },
         ]
     );
@@ -195,14 +162,8 @@ fn components_generate() {
     assert_eq!(
         edits.edits,
         [
-            CreateTextNode {
+            CreateTextNode { text: "text 0", root: 7 },
-                text: "text 0",
+            CreateTextNode { text: "text 1", root: 8 },
-                root: 7,
-            },
-            CreateTextNode {
-                text: "text 1",
-                root: 8,
-            },
             ReplaceWith { root: 6, m: 2 },
         ]
     );

packages/core/tests/miri_stress.rs

@@ -152,12 +152,7 @@ fn free_works_on_root_props() {
         }
     }
 
-    let mut dom = new_dom(
+    let mut dom = new_dom(app, Custom { val: String::from("asd") });
-        app,
-        Custom {
-            val: String::from("asd"),
-        },
-    );
     dom.rebuild();
 }
 

packages/core/tests/sharedstate.rs

@@ -29,10 +29,7 @@ fn shared_state_test() {
     assert_eq!(
         edits,
         [
-            CreateTextNode {
+            CreateTextNode { root: 1, text: "Hello, world!" },
-                root: 1,
-                text: "Hello, world!"
-            },
             AppendChildren { many: 1 },
         ]
     );

packages/core/tests/vdom_rebuild.rs

@@ -68,15 +68,9 @@ fn conditional_rendering() {
         mutations.edits,
         [
             CreateElement { root: 1, tag: "h1" },
-            CreateTextNode {
+            CreateTextNode { root: 2, text: "hello" },
-                root: 2,
-                text: "hello"
-            },
             AppendChildren { many: 1 },
-            CreateElement {
+            CreateElement { root: 3, tag: "span" },
-                root: 3,
-                tag: "span"
-            },
             CreateTextNode { root: 4, text: "a" },
             AppendChildren { many: 1 },
             CreatePlaceholder { root: 5 },