tests: Update tests in wit-component (#190)

This commit applies the new instance formatting to the `component.wat`
files in wit-component

Author: saulecabrera

Cargo.lock

@@ -65,14 +65,20 @@
   (func (;5;) (canon.lift (type 3) (func 2)))
   (alias export (instance 0) "bar#a" (func (;6;)))
   (func (;7;) (canon.lift (type 5) (func 6)))
-  (instance (;1;) (export "a" (func 7)))
+  (instance (;1;)
+    (export "a" (func 7))
+  )
   (alias export (instance 0) "foo#a" (func (;8;)))
   (alias export (instance 0) "foo#b" (func (;9;)))
   (alias export (instance 0) "foo#c" (func (;10;)))
   (func (;11;) (canon.lift (type 0) (func 8)))
   (func (;12;) (canon.lift (type 7) utf8 (into (instance 0)) (func 9)))
   (func (;13;) (canon.lift (type 8) utf8 (into (instance 0)) (func 10)))
-  (instance (;2;) (export "a" (func 11)) (export "b" (func 12)) (export "c" (func 13)))
+  (instance (;2;)
+    (export "a" (func 11))
+    (export "b" (func 12))
+    (export "c" (func 13))
+  )
   (export "a" (func 3))
   (export "b" (func 4))
   (export "c" (func 5))

crates/wit-component/tests/components/exports/component.wat

@@ -78,15 +78,33 @@
   (alias export (instance 3) "1" (func (;1;)))
   (alias export (instance 2) "a" (func (;2;)))
   (func (;3;) (canon.lower (func 2)))
-  (instance (;4;) core (export "a" (func 0)))
-  (instance (;5;) core (export "baz" (func 1)))
-  (instance (;6;) core (export "a" (func 3)))
-  (instance (;7;) (instantiate (module 0) (with "bar" (instance 4)) (with "baz" (instance 5)) (with "foo" (instance 6))))
+  (instance (;4;) core
+    (export "a" (func 0))
+  )
+  (instance (;5;) core
+    (export "baz" (func 1))
+  )
+  (instance (;6;) core
+    (export "a" (func 3))
+  )
+  (instance (;7;) (instantiate (module 0)
+      (with "bar" (instance 4))
+      (with "baz" (instance 5))
+      (with "foo" (instance 6))
+    )
+  )
   (alias export (instance 3) "$imports" (table (;0;)))
   (alias export (instance 0) "a" (func (;4;)))
   (alias export (instance 1) "baz" (func (;5;)))
   (func (;6;) (canon.lower utf8 (into (instance 7)) (func 4)))
   (func (;7;) (canon.lower (into (instance 7)) (func 5)))
-  (instance (;8;) core (export "$imports" (table 0)) (export "0" (func 6)) (export "1" (func 7)))
-  (instance (;9;) (instantiate (module 2) (with "" (instance 8))))
+  (instance (;8;) core
+    (export "$imports" (table 0))
+    (export "0" (func 6))
+    (export "1" (func 7))
+  )
+  (instance (;9;) (instantiate (module 2)
+      (with "" (instance 8))
+    )
+  )
 )

crates/wit-component/tests/components/import-conflict/component.wat

@@ -60,20 +60,34 @@
   )
   (instance (;1;) (instantiate (module 1)))
   (alias export (instance 1) "0" (func (;0;)))
-  (instance (;2;) core (export "a" (func 0)))
-  (instance (;3;) (instantiate (module 0) (with "foo" (instance 2))))
+  (instance (;2;) core
+    (export "a" (func 0))
+  )
+  (instance (;3;) (instantiate (module 0)
+      (with "foo" (instance 2))
+    )
+  )
   (alias export (instance 1) "$imports" (table (;0;)))
   (alias export (instance 0) "a" (func (;1;)))
   (func (;2;) (canon.lower utf8 (into (instance 3)) (func 1)))
-  (instance (;4;) core (export "$imports" (table 0)) (export "0" (func 2)))
-  (instance (;5;) (instantiate (module 2) (with "" (instance 4))))
+  (instance (;4;) core
+    (export "$imports" (table 0))
+    (export "0" (func 2))
+  )
+  (instance (;5;) (instantiate (module 2)
+      (with "" (instance 4))
+    )
+  )
   (alias export (instance 3) "a" (func (;3;)))
   (func (;4;) (canon.lift (type 3) utf8 (into (instance 3)) (func 3)))
   (alias export (instance 3) "bar#a" (func (;5;)))
   (alias export (instance 3) "bar#b" (func (;6;)))
   (func (;7;) (canon.lift (type 4) (func 5)))
   (func (;8;) (canon.lift (type 0) utf8 (into (instance 3)) (func 6)))
-  (instance (;6;) (export "a" (func 7)) (export "b" (func 8)))
+  (instance (;6;)
+    (export "a" (func 7))
+    (export "b" (func 8))
+  )
   (export "a" (func 4))
   (export "bar" (instance 6))
 )

crates/wit-component/tests/components/import-export/component.wat

@@ -111,15 +111,38 @@
   (func (;11;) (canon.lower (func 5)))
   (func (;12;) (canon.lower (func 6)))
   (func (;13;) (canon.lower (func 7)))
-  (instance (;4;) core (export "bar1" (func 0)) (export "bar2" (func 8)))
-  (instance (;5;) core (export "baz1" (func 2)) (export "baz2" (func 9)) (export "baz3" (func 10)))
-  (instance (;6;) core (export "foo1" (func 11)) (export "foo2" (func 12)) (export "foo3" (func 13)))
-  (instance (;7;) (instantiate (module 0) (with "bar" (instance 4)) (with "baz" (instance 5)) (with "foo" (instance 6))))
+  (instance (;4;) core
+    (export "bar1" (func 0))
+    (export "bar2" (func 8))
+  )
+  (instance (;5;) core
+    (export "baz1" (func 2))
+    (export "baz2" (func 9))
+    (export "baz3" (func 10))
+  )
+  (instance (;6;) core
+    (export "foo1" (func 11))
+    (export "foo2" (func 12))
+    (export "foo3" (func 13))
+  )
+  (instance (;7;) (instantiate (module 0)
+      (with "bar" (instance 4))
+      (with "baz" (instance 5))
+      (with "foo" (instance 6))
+    )
+  )
   (alias export (instance 3) "$imports" (table (;0;)))
   (alias export (instance 0) "bar1" (func (;14;)))
   (alias export (instance 1) "baz1" (func (;15;)))
   (func (;16;) (canon.lower utf8 (into (instance 7)) (func 14)))
   (func (;17;) (canon.lower utf8 (into (instance 7)) (func 15)))
-  (instance (;8;) core (export "$imports" (table 0)) (export "0" (func 16)) (export "1" (func 17)))
-  (instance (;9;) (instantiate (module 2) (with "" (instance 8))))
+  (instance (;8;) core
+    (export "$imports" (table 0))
+    (export "0" (func 16))
+    (export "1" (func 17))
+  )
+  (instance (;9;) (instantiate (module 2)
+      (with "" (instance 8))
+    )
+  )
 )

crates/wit-component/tests/components/imports/component.wat

@@ -226,8 +226,28 @@
   (func (;18;) (canon.lower (func 5)))
   (func (;19;) (canon.lower (func 9)))
   (func (;20;) (canon.lower (func 13)))
-  (instance (;2;) core (export "a" (func 16)) (export "b" (func 1)) (export "c" (func 2)) (export "d" (func 3)) (export "e" (func 17)) (export "f" (func 18)) (export "g" (func 6)) (export "h" (func 7)) (export "i" (func 8)) (export "j" (func 19)) (export "k" (func 10)) (export "l" (func 11)) (export "m" (func 12)) (export "n" (func 20)) (export "o" (func 14)) (export "p" (func 15)))
-  (instance (;3;) (instantiate (module 0) (with "foo" (instance 2))))
+  (instance (;2;) core
+    (export "a" (func 16))
+    (export "b" (func 1))
+    (export "c" (func 2))
+    (export "d" (func 3))
+    (export "e" (func 17))
+    (export "f" (func 18))
+    (export "g" (func 6))
+    (export "h" (func 7))
+    (export "i" (func 8))
+    (export "j" (func 19))
+    (export "k" (func 10))
+    (export "l" (func 11))
+    (export "m" (func 12))
+    (export "n" (func 20))
+    (export "o" (func 14))
+    (export "p" (func 15))
+  )
+  (instance (;3;) (instantiate (module 0)
+      (with "foo" (instance 2))
+    )
+  )
   (alias export (instance 1) "$imports" (table (;0;)))
   (alias export (instance 0) "b" (func (;21;)))
   (alias export (instance 0) "c" (func (;22;)))
@@ -251,6 +271,22 @@
   (func (;40;) (canon.lower (into (instance 3)) (func 29)))
   (func (;41;) (canon.lower utf8 (into (instance 3)) (func 30)))
   (func (;42;) (canon.lower (into (instance 3)) (func 31)))
-  (instance (;4;) core (export "$imports" (table 0)) (export "0" (func 32)) (export "1" (func 33)) (export "2" (func 34)) (export "3" (func 35)) (export "4" (func 36)) (export "5" (func 37)) (export "6" (func 38)) (export "7" (func 39)) (export "8" (func 40)) (export "9" (func 41)) (export "10" (func 42)))
-  (instance (;5;) (instantiate (module 2) (with "" (instance 4))))
+  (instance (;4;) core
+    (export "$imports" (table 0))
+    (export "0" (func 32))
+    (export "1" (func 33))
+    (export "2" (func 34))
+    (export "3" (func 35))
+    (export "4" (func 36))
+    (export "5" (func 37))
+    (export "6" (func 38))
+    (export "7" (func 39))
+    (export "8" (func 40))
+    (export "9" (func 41))
+    (export "10" (func 42))
+  )
+  (instance (;5;) (instantiate (module 2)
+      (with "" (instance 4))
+    )
+  )
 )