From 7fb683df0b4d466ba438a42180adb9987f3ed7c0 Mon Sep 17 00:00:00 2001 From: Reuben Dunnington Date: Sun, 9 Jun 2024 10:26:48 -0700 Subject: [PATCH] upgrade to zig 0.13.0 --- .github/workflows/ci.yml | 2 +- README.md | 2 +- src/wasi.zig | 4 ++-- test/wasm/main.zig | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 92d014d..837b6c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: - uses: goto-bus-stop/setup-zig@v2 with: - version: 0.12.0 + version: 0.13.0 # The current default version of clang on macos runners is 14, which doesn't support the wasm64-freestanding target. - name: Install LLVM and Clang diff --git a/README.md b/README.md index 30d6064..c41b2fa 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Bytebox is a WebAssembly VM. # Getting started ### Requirements -Bytebox currently builds with [Zig 0.12.x](https://ziglang.org/download) to avoid churn on zig master. +Bytebox currently builds with [Zig 0.13.x](https://ziglang.org/download) to avoid churn on zig master. To run the tests: * `wasm-tools` is required to run the wasm testsuite. You can install it via the rust toolchain `cargo install wasm-tools` or directly from the [release page](https://github.com/bytecodealliance/wasm-tools/releases). diff --git a/src/wasi.zig b/src/wasi.zig index 5f10c8b..78ea382 100644 --- a/src/wasi.zig +++ b/src/wasi.zig @@ -1685,8 +1685,8 @@ const Helpers = struct { }; if (getMemorySlice(module, iov_base, iov_len, errno)) |mem| { - iovec.iov_base = mem.ptr; - iovec.iov_len = mem.len; + iovec.base = mem.ptr; + iovec.len = mem.len; } } diff --git a/test/wasm/main.zig b/test/wasm/main.zig index 870ce96..7847587 100644 --- a/test/wasm/main.zig +++ b/test/wasm/main.zig @@ -1595,7 +1595,7 @@ pub fn main() !void { } }; - var process = std.ChildProcess.init(&[_][]const u8{ "wasm-tools", "json-from-wast", "--pretty", "-o", suite_json_filename, suite_wast_path_relative }, allocator); + var process = std.process.Child.init(&[_][]const u8{ "wasm-tools", "json-from-wast", "--pretty", "-o", suite_json_filename, suite_wast_path_relative }, allocator); process.cwd = suite_wasm_folder;