modernize code

Author: cpetig

Cargo.lock

@@ -1772,7 +1772,7 @@ impl<'a, B: Bindgen> Generator<'a, B> {
                 }
                 TypeDefKind::Unknown => unreachable!(),
                 TypeDefKind::FixedSizeList(ty, size) => {
-                    let temp = flat_types(self.resolve, ty).unwrap();
+                    let temp = flat_types(self.resolve, ty, None).unwrap();
                     let flat_per_elem = temp.to_vec().len();
                     let flatsize = flat_per_elem * (*size as usize);
                     let mut lowered_args = self

crates/core/src/abi.rs

@@ -1393,7 +1393,7 @@ impl Bindgen for FunctionBindgen<'_, '_> {
             | Instruction::DropHandle { .. }
             | Instruction::FixedSizeListLift { .. }
             | Instruction::FixedSizeListLower { .. }
-            | Instruction::FixedSizeListLowerBlock { .. }
+            | Instruction::FixedSizeListLowerMemory { .. }
             => {
                 dbg!(inst);
                 todo!()

crates/csharp/src/function.rs

@@ -2,64 +2,71 @@ include!(env!("BINDINGS"));
 
 use test::fixed_size_lists::to_test::*;
 
-fn main() {
-    list_param([1, 2, 3, 4]);
-    list_param2([[1, 2], [3, 4]]);
-    list_param3([
-        -1, 2, -3, 4, -5, 6, -7, 8, -9, 10, -11, 12, -13, 14, -15, 16, -17, 18, -19, 20,
-    ]);
-    {
-        let result = list_result();
-        assert_eq!(result, [b'0', b'1', b'A', b'B', b'a', b'b', 128, 255]);
-    }
-    {
-        let result = list_minmax16([0, 1024, 32768, 65535], [1, 2048, -32767, -2]);
-        assert_eq!(result, ([0, 1024, 32768, 65535], [1, 2048, -32767, -2]));
-    }
-    {
-        let result = list_minmax_float([2.0, -42.0], [0.25, -0.125]);
-        assert_eq!(result, ([2.0, -42.0], [0.25, -0.125]));
-    }
-    {
-        let result = list_roundtrip([b'a', b'b', b'c', b'd', 0, 1, 2, 3, b'A', b'B', b'Y', b'Z']);
-        assert_eq!(
-            result,
-            [b'a', b'b', b'c', b'd', 0, 1, 2, 3, b'A', b'B', b'Y', b'Z']
-        );
-    }
-    {
-        let result = nested_roundtrip([[1, 5], [42, 1_000_000]], [[-1, 3], [-2_000_000, 4711]]);
-        assert_eq!(
-            result,
-            ([[1, 5], [42, 1_000_000]], [[-1, 3], [-2_000_000, 4711]])
-        );
-    }
-    {
-        let result = large_roundtrip(
-            [[1, 5], [42, 1_000_000]],
-            [
-                [-1, 3, -2, 4],
-                [-2_000_000, 4711, 99_999, -5],
-                [-6, 7, 8, -9],
-                [50, -5, 500, -5000],
-            ],
-        );
-        assert_eq!(
-            result,
-            (
+struct Component;
+
+export!(Component);
+
+impl Guest for Component {
+    fn run() {
+        list_param([1, 2, 3, 4]);
+        list_param2([[1, 2], [3, 4]]);
+        list_param3([
+            -1, 2, -3, 4, -5, 6, -7, 8, -9, 10, -11, 12, -13, 14, -15, 16, -17, 18, -19, 20,
+        ]);
+        {
+            let result = list_result();
+            assert_eq!(result, [b'0', b'1', b'A', b'B', b'a', b'b', 128, 255]);
+        }
+        {
+            let result = list_minmax16([0, 1024, 32768, 65535], [1, 2048, -32767, -2]);
+            assert_eq!(result, ([0, 1024, 32768, 65535], [1, 2048, -32767, -2]));
+        }
+        {
+            let result = list_minmax_float([2.0, -42.0], [0.25, -0.125]);
+            assert_eq!(result, ([2.0, -42.0], [0.25, -0.125]));
+        }
+        {
+            let result =
+                list_roundtrip([b'a', b'b', b'c', b'd', 0, 1, 2, 3, b'A', b'B', b'Y', b'Z']);
+            assert_eq!(
+                result,
+                [b'a', b'b', b'c', b'd', 0, 1, 2, 3, b'A', b'B', b'Y', b'Z']
+            );
+        }
+        {
+            let result = nested_roundtrip([[1, 5], [42, 1_000_000]], [[-1, 3], [-2_000_000, 4711]]);
+            assert_eq!(
+                result,
+                ([[1, 5], [42, 1_000_000]], [[-1, 3], [-2_000_000, 4711]])
+            );
+        }
+        {
+            let result = large_roundtrip(
                 [[1, 5], [42, 1_000_000]],
                 [
                     [-1, 3, -2, 4],
                     [-2_000_000, 4711, 99_999, -5],
                     [-6, 7, 8, -9],
-                    [50, -5, 500, -5000]
-                ]
-            )
-        );
-    }
-    {
-        let result = nightmare_on_cpp([Nested { l: [1, -1] }, Nested { l: [2, -2] }]);
-        assert_eq!(result[0].l, [1, -1]);
-        assert_eq!(result[1].l, [2, -2]);
+                    [50, -5, 500, -5000],
+                ],
+            );
+            assert_eq!(
+                result,
+                (
+                    [[1, 5], [42, 1_000_000]],
+                    [
+                        [-1, 3, -2, 4],
+                        [-2_000_000, 4711, 99_999, -5],
+                        [-6, 7, 8, -9],
+                        [50, -5, 500, -5000]
+                    ]
+                )
+            );
+        }
+        {
+            let result = nightmare_on_cpp([Nested { l: [1, -1] }, Nested { l: [2, -2] }]);
+            assert_eq!(result[0].l, [1, -1]);
+            assert_eq!(result[1].l, [2, -2]);
+        }
     }
 }

tests/runtime/fixed-size-list/runner.rs

@@ -30,4 +30,6 @@ world test {
 
 world runner {
   import to-test;
+
+  export run: func();
 }