chore: Add rust dependencies to gh-actions

Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>

Author: GordonSmith

.github/workflows/macos.yml

@@ -36,14 +36,22 @@ jobs:
           submodules: recursive
 
       - uses: actions/cache@v3
+        if: always() 
         with:
-          path: "build/vcpkg_installed/**/*"
-          key: ${{ matrix.os }}-vcpkg_installed
+          key: ${{ matrix.os }}-packages
+          path: |
+            "build/vcpkg_installed/**/*"
+            ~/.cargo/registry
+            ~/.cargo/git
 
       - name: install dependencies
         run: |
           brew install pkg-config autoconf autoconf-archive automake coreutils libtool cmake ninja
 
+      - name: Install rust dependencies
+        run: |
+          cargo install wasm-tools wit-bindgen-cli 
+
       - name: configure
         run: |
           cmake --preset linux-ninja-Debug

.github/workflows/ubuntu.yml

@@ -30,9 +30,13 @@ jobs:
           submodules: recursive
 
       - uses: actions/cache@v3
+        if: always() 
         with:
-          path: "build/vcpkg_installed/**/*"
-          key: ${{ matrix.os }}-vcpkg_installed
+          key: ${{ matrix.os }}-packages
+          path: |
+            "build/vcpkg_installed/**/*"
+            ~/.cargo/registry
+            ~/.cargo/git
 
       - name: install dependencies
         run: |
@@ -43,6 +47,10 @@ jobs:
           build-essential \
           ninja-build
 
+      - name: Install rust dependencies
+        run: |
+          cargo install wasm-tools wit-bindgen-cli 
+
       - name: configure
         run: |
           cmake --preset linux-ninja-Debug

.github/workflows/windows.yml

@@ -31,9 +31,17 @@ jobs:
           submodules: recursive
 
       - uses: actions/cache@v3
+        if: always() 
         with:
-          path: "build/vcpkg_installed/**/*"
-          key: ${{ matrix.os }}-vcpkg_installed
+          key: ${{ matrix.os }}-packages
+          path: |
+            "build/vcpkg_installed/**/*"
+            ~/.cargo/registry
+            ~/.cargo/git
+
+      - name: Install rust dependencies
+        run: |
+          cargo install wasm-tools wit-bindgen-cli 
 
       - name: configure
         run: |

include/cmcpp/list.hpp

@@ -82,10 +82,6 @@ namespace cmcpp
         list_t<T> lift_flat(const CallContext &cx, const CoreValueIter &vi)
         {
             auto ptr = vi.next<int32_t>();
-            if (vi.done())
-            {
-                return cmcpp::list::load<T>(cx, ptr);
-            }
             auto length = vi.next<int32_t>();
             return load_from_range<T>(cx, ptr, length);
         }

include/cmcpp/string.hpp

@@ -320,10 +320,6 @@ namespace cmcpp
         T lift_flat(const CallContext &cx, const CoreValueIter &vi)
         {
             auto ptr = vi.next<int32_t>();
-            if (vi.done())
-            {
-                return cmcpp::string::load<T>(cx, ptr);
-            }
             auto packed_length = vi.next<int32_t>();
             return load_from_range<T>(cx, ptr, packed_length);
         }

include/cmcpp/util.hpp

@@ -11,7 +11,7 @@ namespace cmcpp
     {
         if (condition)
         {
-            cx.trap(message);
+            cx.trap(message == nullptr ? "Unknown trap" : message);
         }
     }
 
@@ -31,7 +31,7 @@ namespace cmcpp
     {
         uint32_t retVal = v;
         trap_if(cx, retVal >= 0x110000);
-        trap_if(cx, 0xD800 <= retVal && retVal <= 0xDFFF);
+        trap_if(cx, 0xD800 <= retVal && retVal <= 0xDFFF, "Invalid char value");
         return retVal;
     }
 

vcpkg_overlays/wasi-sdk/portfile.cmake

@@ -1,9 +1,26 @@
+# https://github.com/WebAssembly/wasi-sdk/releases
+
+if(APPLE)
+    vcpkg_download_distfile(ARCHIVE
+        URLS "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-${VERSION}-arm64-macos.tar.gz"
+        FILENAME "wasi-sdk-${VERSION}-x86_64-linux.tar.gz"
+        SHA512 fa4852de1995eaaf5aa57dab9896604a27f157b6113ca0daa27fe7588f4276e18362e650bdb6c65fd83f14d4b8347f8134c9b531a8b872ad83c18d481eeef6c5
+    )
+elseif(UNIX)
 vcpkg_download_distfile(ARCHIVE
     URLS "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-${VERSION}-x86_64-linux.tar.gz"
     FILENAME "wasi-sdk-${VERSION}-x86_64-linux.tar.gz"
     SHA512 716acc4b737ad6f51c6b32c3423612c03df9a3165bde3d6e24df5c86779b8be9463f5a79e620f2fc49707275563a6c9710242caca27e1ad9dd2c69e8fce8a766
 )
 
+elseif(WIN32)
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-${VERSION}-x86_64-windows.tar.gz"
+    FILENAME "wasi-sdk-${VERSION}-x86_64-windows.tar.gz"
+    SHA512 0
+)
+endif()
+
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}

vcpkg_overlays/wasi-sdk/vcpkg.json

@@ -3,6 +3,5 @@
   "version-string": "25.0",
   "description": "Wasi SDK for building wasm from C++.",
   "homepage": "https://github.com/WebAssembly/wasi-sdk",
-  "supports": "linux",
   "license": "Apache-2.0"
 }