build: upgrade zig from 0.15 to 0.16 (#128)

* zig 0.16.0 compat

* remove util compat

* lint fix

* fix

* ci: use 0.16.0

* fix

Author: hendriknielaender

.github/workflows/release.yml

@@ -10,12 +10,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Zig
         uses: mlugg/setup-zig@v2
         with:
-          version: 0.15.1
+          version: 0.16.0
 
       - name: Build release
         run: zig build release

.github/workflows/zig.yml

@@ -15,15 +15,15 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{matrix.os}}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: mlugg/setup-zig@v2
         with:
-          version: 0.15.1
+          version: 0.16.0
       - run: zig build test
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: mlugg/setup-zig@v2
       - run: zig fmt --check src/*.zig
       - uses: DonIsaac/zlint-action@v0

README.md

@@ -233,7 +233,7 @@ zvm completions fish > ~/.config/fish/completions/zvm.fish
 ## 🏗️ Building from Source
 
 ### Prerequisites
-- Zig 0.15.1 or later
+- Zig 0.16.0 or later
 
 ### Build Steps
 ```bash

build.zig

@@ -3,9 +3,9 @@ const builtin = @import("builtin");
 
 const Build = std.Build;
 
-const min_zig_string = "0.15.1";
-const semver = std.SemanticVersion{ .major = 0, .minor = 16, .patch = 5 };
-const semver_string = "0.17.0";
+const min_zig_string = "0.16.0";
+const semver = std.SemanticVersion{ .major = 0, .minor = 18, .patch = 0 };
+const semver_string = "0.18.0";
 
 // comptime detect the zig version
 comptime {

src/Context.zig

@@ -23,6 +23,9 @@ pub const CliContext = struct {
     /// Static memory system for any remaining allocations.
     static_mem: static_memory.StaticMemory,
 
+    /// Process-owned I/O implementation.
+    io: std.Io,
+
     /// Singleton instance - set during initialization.
     var instance: ?*CliContext = null;
 
@@ -31,6 +34,7 @@ pub const CliContext = struct {
         context_storage: *CliContext,
         static_buffer: []u8,
         arguments: []const []const u8,
+        io: std.Io,
     ) !*CliContext {
         // context_storage is a pointer, not optional - can't be null in Zig
         assert(static_buffer.len > 0);
@@ -45,6 +49,7 @@ pub const CliContext = struct {
 
         // Initialize core systems
         try init_core_systems(context_storage, static_buffer);
+        context_storage.io = io;
 
         // Copy command line arguments
         try copy_args(context_storage, arguments);
@@ -114,13 +119,10 @@ pub const CliContext = struct {
     fn init_home_directory(context_storage: *CliContext) !void {
         const home = blk: {
             if (builtin.os.tag == .windows) {
-                const key_w = comptime std.unicode.wtf8ToWtf16LeStringLiteral("USERPROFILE");
-                const home_w = std.process.getenvW(key_w) orelse break :blk "./";
-                const home_len = std.unicode.wtf16LeToWtf8(&context_storage.home_dir_buffer, home_w);
-                break :blk context_storage.home_dir_buffer[0..home_len];
+                break :blk util_tool.getenv_cross_platform("USERPROFILE") orelse "./";
             }
 
-            break :blk std.posix.getenv("HOME") orelse "./";
+            break :blk util_tool.getenv_cross_platform("HOME") orelse "./";
         };
 
         // Validate home directory
@@ -210,24 +212,21 @@ pub const CliContext = struct {
 
         // buffer is a pointer, not optional - no need for null check
 
-        var fixed_buffer_stream = std.Io.fixedBufferStream(buffer.slice());
         const home_dir = self.get_home_dir();
         assert(home_dir.len > 0);
 
         // Follow XDG Base Directory specification
-        if (util_tool.getenv_cross_platform("XDG_DATA_HOME")) |xdg_data| {
-            try fixed_buffer_stream.writer().print("{s}/.zm/{s}", .{ xdg_data, segment });
-        } else {
-            // Use XDG default: $HOME/.local/share/.zm
-            try fixed_buffer_stream.writer().print("{s}/.local/share/.zm/{s}", .{ home_dir, segment });
-        }
+        const result = if (util_tool.getenv_cross_platform("XDG_DATA_HOME")) |xdg_data|
+            try std.fmt.bufPrint(buffer.slice(), "{s}/.zm/{s}", .{ xdg_data, segment })
+        else
+            try std.fmt.bufPrint(buffer.slice(), "{s}/.local/share/.zm/{s}", .{ home_dir, segment });
 
-        const result = try buffer.set(fixed_buffer_stream.getWritten());
+        const path = try buffer.set(result);
 
-        assert(result.len > 0);
-        assert(result.len <= limits.limits.path_length_maximum);
+        assert(path.len > 0);
+        assert(path.len <= limits.limits.path_length_maximum);
 
-        return result;
+        return path;
     }
 
     /// Get a ZON allocator
@@ -267,7 +266,7 @@ pub const CliContext = struct {
         const pool_stats = self.get_pool_stats();
 
         var buffer: [limits.limits.io_buffer_size_maximum]u8 = undefined;
-        var stderr_writer = std.fs.File.Writer.init(std.fs.File.stderr(), &buffer);
+        var stderr_writer = std.Io.File.stderr().writer(self.io, &buffer);
         const stderr = &stderr_writer.interface;
         try stderr.print("\n=== ZVM Resource Usage ===\n", .{});
         try stderr.print("{any}\n", .{mem_usage});

src/cli/validation.zig

@@ -342,7 +342,7 @@ fn validate_install(raw: raw_args.RawArgs.InstallArgs) !ValidatedCommand.Install
             util_output.fatal(.invalid_arguments, "patch version too large in '{s}' (maximum: 999)", .{version_str});
         },
         error.LatestNotSupported => {
-            util_output.fatal(.invalid_arguments, "'latest' is not supported. Use 'master' for the development version or a specific version like '0.15.1'", .{});
+            util_output.fatal(.invalid_arguments, "'latest' is not supported. Use 'master' for the development version or a specific version like '0.16.0'", .{});
         },
     };
 
@@ -403,7 +403,7 @@ fn validate_remove(raw: raw_args.RawArgs.RemoveArgs) !ValidatedCommand.RemoveCom
             util_output.fatal(.invalid_arguments, "patch version too large in '{s}' (maximum: 999)", .{version_str});
         },
         error.LatestNotSupported => {
-            util_output.fatal(.invalid_arguments, "'latest' is not supported. Use 'master' for the development version or a specific version like '0.15.1'", .{});
+            util_output.fatal(.invalid_arguments, "'latest' is not supported. Use 'master' for the development version or a specific version like '0.16.0'", .{});
         },
     };
 
@@ -454,7 +454,7 @@ fn validate_use(raw: raw_args.RawArgs.UseArgs) !ValidatedCommand.UseCommand {
             util_output.fatal(.invalid_arguments, "patch version too large in '{s}' (maximum: 999)", .{version_str});
         },
         error.LatestNotSupported => {
-            util_output.fatal(.invalid_arguments, "'latest' is not supported. Use 'master' for the development version or a specific version like '0.15.1'", .{});
+            util_output.fatal(.invalid_arguments, "'latest' is not supported. Use 'master' for the development version or a specific version like '0.16.0'", .{});
         },
     };
 

src/commands/clean.zig

@@ -53,7 +53,7 @@ fn clean_download_store(ctx: *context.CliContext, emit_human: bool) !StoreCleanu
     defer store_buffer.reset();
 
     const store_path = try util_data.get_zvm_store(store_buffer);
-    var store_dir = std.fs.openDirAbsolute(store_path, .{ .iterate = true }) catch |err| {
+    var store_dir = std.Io.Dir.openDirAbsolute(ctx.io, store_path, .{ .iterate = true }) catch |err| {
         if (err == error.FileNotFound) {
             if (emit_human) {
                 util_output.info("No old download artifacts found to clean.", .{});
@@ -63,9 +63,9 @@ fn clean_download_store(ctx: *context.CliContext, emit_human: bool) !StoreCleanu
 
         return err;
     };
-    defer store_dir.close();
+    defer store_dir.close(ctx.io);
 
-    const cleanup = try remove_download_artifacts(&store_dir);
+    const cleanup = try remove_download_artifacts(ctx.io, &store_dir);
     if (!emit_human) return cleanup;
 
     if (cleanup.files_removed == 0) {
@@ -81,18 +81,18 @@ fn clean_download_store(ctx: *context.CliContext, emit_human: bool) !StoreCleanu
     return cleanup;
 }
 
-fn remove_download_artifacts(store_dir: *std.fs.Dir) !StoreCleanup {
+fn remove_download_artifacts(io: std.Io, store_dir: *std.Io.Dir) !StoreCleanup {
     var iterator = store_dir.iterate();
     var cleanup = StoreCleanup{};
 
-    while (try iterator.next()) |entry| {
+    while (try iterator.next(io)) |entry| {
         if (entry.kind != .file) continue;
 
-        const file = try store_dir.openFile(entry.name, .{});
-        const file_info = try file.stat();
-        file.close();
+        const file = try store_dir.openFile(io, entry.name, .{});
+        const file_info = try file.stat(io);
+        file.close(io);
 
-        try store_dir.deleteFile(entry.name);
+        try store_dir.deleteFile(io, entry.name);
         cleanup.files_removed += 1;
         cleanup.bytes_freed += file_info.size;
     }
@@ -147,7 +147,7 @@ fn read_current_version(
         .zig => try util_data.get_zvm_current_zig(current_path_buffer),
         .zls => try util_data.get_zvm_current_zls(current_path_buffer),
     };
-    if (!util_tool.does_path_exist(current_path)) return null;
+    if (!util_tool.does_path_exist(ctx.io, current_path)) return null;
 
     var output_buffer: [limits.limits.temp_buffer_size]u8 = undefined;
     const version_output = util_data.get_current_version(
@@ -180,16 +180,16 @@ fn clean_versions_for_tool(
         .zig => try util_data.get_zvm_zig_version(versions_path_buffer),
         .zls => try util_data.get_zvm_zls_version(versions_path_buffer),
     };
-    var versions_dir = std.fs.openDirAbsolute(versions_path, .{ .iterate = true }) catch |err| {
+    var versions_dir = std.Io.Dir.openDirAbsolute(ctx.io, versions_path, .{ .iterate = true }) catch |err| {
         if (err == error.FileNotFound) return 0;
         return err;
     };
-    defer versions_dir.close();
+    defer versions_dir.close(ctx.io);
 
     var iterator = versions_dir.iterate();
     var versions_removed: usize = 0;
 
-    while (try iterator.next()) |entry| {
+    while (try iterator.next(ctx.io)) |entry| {
         if (entry.kind != .directory) continue;
 
         if (current_version) |current| {
@@ -208,7 +208,7 @@ fn clean_versions_for_tool(
             util_output.info("  Removing {s} {s}", .{ tool.to_string(), entry.name });
         }
 
-        try versions_dir.deleteTree(entry.name);
+        try versions_dir.deleteTree(ctx.io, entry.name);
         versions_removed += 1;
     }
 
@@ -218,18 +218,19 @@ fn clean_versions_for_tool(
 test "remove_download_artifacts deletes only files" {
     var tmp_dir = std.testing.tmpDir(.{});
     defer tmp_dir.cleanup();
+    const io = std.testing.io;
 
-    const artifact = try tmp_dir.dir.createFile("artifact.tar.xz", .{});
-    try artifact.writeAll("artifact");
-    artifact.close();
+    const artifact = try tmp_dir.dir.createFile(io, "artifact.tar.xz", .{});
+    try artifact.writeStreamingAll(io, "artifact");
+    artifact.close(io);
 
-    try tmp_dir.dir.makeDir("versions");
+    try tmp_dir.dir.createDir(io, "versions", .default_dir);
 
     var dir = tmp_dir.dir;
-    const cleanup = try remove_download_artifacts(&dir);
+    const cleanup = try remove_download_artifacts(io, &dir);
 
     try std.testing.expectEqual(@as(usize, 1), cleanup.files_removed);
     try std.testing.expectEqual(@as(u64, 8), cleanup.bytes_freed);
-    try std.testing.expectError(error.FileNotFound, dir.access("artifact.tar.xz", .{}));
-    try dir.access("versions", .{});
+    try std.testing.expectError(error.FileNotFound, dir.access(io, "artifact.tar.xz", .{}));
+    try dir.access(io, "versions", .{});
 }

src/commands/env.zig

@@ -37,16 +37,12 @@ pub fn execute(
 }
 
 fn build_zvm_bin_path(ctx: *context.CliContext, buffer: []u8) ![]const u8 {
-    var stream = std.Io.fixedBufferStream(buffer);
     const home_dir = ctx.get_home_dir();
 
-    if (util_tool.getenv_cross_platform("XDG_DATA_HOME")) |xdg_data| {
-        try stream.writer().print("{s}/.zm/bin", .{xdg_data});
-    } else {
-        try stream.writer().print("{s}/.local/share/.zm/bin", .{home_dir});
-    }
-
-    return stream.getWritten();
+    return if (util_tool.getenv_cross_platform("XDG_DATA_HOME")) |xdg_data|
+        try std.fmt.bufPrint(buffer, "{s}/.zm/bin", .{xdg_data})
+    else
+        try std.fmt.bufPrint(buffer, "{s}/.local/share/.zm/bin", .{home_dir});
 }
 
 fn detect_shell_name(shell: ?validation.ShellType, buffer: []u8) ![]const u8 {
@@ -78,8 +74,8 @@ fn detect_windows_shell(buffer: []u8) ![]const u8 {
 }
 
 fn build_env_text(shell_name: []const u8, zvm_bin_path: []const u8, buffer: []u8) ![]const u8 {
-    var stream = std.Io.fixedBufferStream(buffer);
-    const writer = stream.writer();
+    var writer_state: std.Io.Writer = .fixed(buffer);
+    const writer: *std.Io.Writer = &writer_state;
 
     if (std.mem.indexOf(u8, shell_name, "fish") != null) {
         try writer.print("# Add this to your ~/.config/fish/config.fish:\n", .{});
@@ -107,14 +103,13 @@ fn build_env_text(shell_name: []const u8, zvm_bin_path: []const u8, buffer: []u8
         try writer.print("export PATH=\"{s}:$PATH\"\n", .{zvm_bin_path});
     }
 
-    return stream.getWritten();
+    return writer_state.buffered();
 }
 
 fn get_windows_env_var(comptime var_name: []const u8, buffer: []u8) !?[]const u8 {
     if (builtin.os.tag != .windows) return null;
-    const key_w = comptime std.unicode.wtf8ToWtf16LeStringLiteral(var_name);
-    const result_w = std.process.getenvW(key_w) orelse return null;
-    const result_len = std.unicode.wtf16LeToWtf8(buffer, result_w);
-    if (result_len > buffer.len) return error.BufferTooSmall;
-    return buffer[0..result_len];
+    const value = util_tool.getenv_cross_platform(var_name) orelse return null;
+    if (value.len > buffer.len) return error.BufferTooSmall;
+    @memcpy(buffer[0..value.len], value);
+    return buffer[0..value.len];
 }

src/commands/help.zig

@@ -59,9 +59,9 @@ const install_help_text =
     \\    --zls                   Install ZLS instead of Zig
     \\
     \\EXAMPLES:
-    \\    zvm install 0.15.1
+    \\    zvm install 0.16.0
     \\    zvm i master
-    \\    zvm install --zls 0.15.1
+    \\    zvm install --zls 0.16.0
     \\
 ;
 
@@ -77,7 +77,7 @@ const remove_help_text =
     \\    --zls                   Remove ZLS instead of Zig
     \\
     \\EXAMPLES:
-    \\    zvm remove 0.15.1
+    \\    zvm remove 0.16.0
     \\    zvm rm --zls master
     \\
 ;
@@ -94,7 +94,7 @@ const use_help_text =
     \\    --zls                   Select ZLS instead of Zig
     \\
     \\EXAMPLES:
-    \\    zvm use 0.15.1
+    \\    zvm use 0.16.0
     \\    zvm u --zls master
     \\
 ;
@@ -288,7 +288,7 @@ test "help command executes without error" {
     _ = try util_output.init_global(output_config);
 
     const command = validation.ValidatedCommand.HelpCommand{ .topic = .general };
-    const progress_node = std.Progress.start(.{ .root_name = "test" });
+    const progress_node = std.Progress.start(std.testing.io, .{ .root_name = "test" });
     defer progress_node.end();
 
     var mock_ctx: context.CliContext = undefined;

src/commands/list.zig

@@ -42,16 +42,16 @@ fn collect_versions(
         .zig => try util_data.get_zvm_zig_version(versions_path_buffer),
         .zls => try util_data.get_zvm_zls_version(versions_path_buffer),
     };
-    var versions_dir = std.fs.openDirAbsolute(versions_path, .{ .iterate = true }) catch |err| {
+    var versions_dir = std.Io.Dir.openDirAbsolute(ctx.io, versions_path, .{ .iterate = true }) catch |err| {
         if (err == error.FileNotFound) return 0;
         return err;
     };
-    defer versions_dir.close();
+    defer versions_dir.close(ctx.io);
 
     var version_count: usize = 0;
     var iterator = versions_dir.iterate();
 
-    while (try iterator.next()) |entry| {
+    while (try iterator.next(ctx.io)) |entry| {
         if (entry.kind != .directory) continue;
         if (entry.name[0] == '.') continue;
         if (version_count >= versions.len) break;