Update codebase to 0.16

Author: kenrap

.github/workflows/ci.yml

@@ -4,7 +4,7 @@ name: CI
 "on": [push, pull_request]
 
 env:
-  ZIG_VERSION: 0.15.2
+  ZIG_VERSION: 0.16.0
 
 jobs:
   test:

src/lib.zig

@@ -4,8 +4,11 @@ const fs = std.fs;
 const mem = std.mem;
 
 const Allocator = std.mem.Allocator;
-const File = std.fs.File;
-const Dir = std.fs.Dir;
+const Args = std.process.Args;
+
+const Io = std.Io;
+const File = Io.File;
+const Dir = Io.Dir;
 
 const print = std.debug.print;
 
@@ -122,9 +125,10 @@ pub const ZonDependencyIterator = struct {
     buffer: []const u8,
     index: usize,
 
-    pub fn init(alc: Allocator, file: *const File) !?Self {
-        const stat = try file.stat();
-        const contents = try file.readToEndAlloc(alc, stat.size);
+    pub fn init(alc: Allocator, file: *const File, io: Io) !?Self {
+        const stat = try file.stat(io);
+        var file_reader = file.reader(io, &.{});
+        const contents = try file_reader.interface.allocRemaining(alc, .limited(stat.size + 1));
         const dep_index = mem.indexOf(u8, contents, ".dependencies") orelse return null;
         const start = mem.indexOf(u8, contents[dep_index..], "{") orelse return null;
 
@@ -166,28 +170,28 @@ pub const ZonFileIterator = struct {
     dir: Dir,
     inner_iter: Dir.Walker,
 
-    pub fn init(alc: Allocator) !Self {
-        var args = std.process.args();
-        _ = args.skip();
-        const path = args.next() orelse return error.MissingDirPathArgument;
-        var dir = try std.fs.cwd().openDir(path, .{});
+    pub fn init(alc: Allocator, args: Args, io: Io) !Self {
+        var args_iter = args.iterate();
+        _ = args_iter.skip();
+        const path = args_iter.next() orelse return error.MissingDirPathArgument;
+        var dir = try Dir.cwd().openDir(io, path, .{ .iterate = true });
         return .{
             .dir = dir,
             .inner_iter = try dir.walk(alc),
         };
     }
 
-    pub fn deinit(self: *Self) void {
-        self.dir.close();
+    pub fn deinit(self: *Self, io: Io) void {
+        self.dir.close(io);
         self.inner_iter.deinit();
     }
 
-    pub fn next(self: *Self) !?File {
-        while (try self.inner_iter.next()) |entry| {
+    pub fn next(self: *Self, io: Io) !?File {
+        while (try self.inner_iter.next(io)) |entry| {
             if (entry.kind != File.Kind.file)
                 continue;
             if (mem.endsWith(u8, entry.path, ".zon"))
-                return try self.dir.openFile(entry.path, .{});
+                return try self.dir.openFile(io, entry.path, .{});
         }
         return null;
     }

src/main.zig

@@ -1,25 +1,25 @@
 const std = @import("std");
 const fmt = std.fmt;
-const fs = std.fs;
+const File = std.Io.File;
 const mem = std.mem;
 const ArrayList = std.ArrayList;
 
 const lib = @import("lib.zig");
 
-pub fn main() !void {
-    var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
-    defer arena.deinit();
-    const alc = arena.allocator();
+pub fn main(init: std.process.Init) !void {
+    const alc = init.arena.allocator();
+    const args = init.minimal.args;
+    const io = init.io;
 
-    var zon_iter = try lib.ZonFileIterator.init(alc);
-    defer zon_iter.deinit();
+    var zon_iter = try lib.ZonFileIterator.init(alc, args, io);
+    defer zon_iter.deinit(io);
 
     var deps = try std.ArrayList(lib.Dependency).initCapacity(alc, 8);
     defer deps.deinit(alc);
 
-    while (try zon_iter.next()) |file| {
-        defer file.close();
-        var dep_iter = try lib.ZonDependencyIterator.init(alc, &file) orelse continue;
+    while (try zon_iter.next(io)) |file| {
+        defer file.close(io);
+        var dep_iter = try lib.ZonDependencyIterator.init(alc, &file, io) orelse continue;
         while (dep_iter.next()) |dep| {
             try deps.append(alc, dep);
         }
@@ -43,7 +43,7 @@ pub fn main() !void {
 
     mem.sort([]const u8, lines.items, {}, lib.stringLessThan);
     var stdout_buffer: [1024 * 8]u8 = undefined;
-    var stdout_writer = fs.File.stdout().writer(&stdout_buffer);
+    var stdout_writer = File.stdout().writer(io, &stdout_buffer);
     var stdout = &stdout_writer.interface;
     try stdout.print("ZIG_TUPLE=\t{s}", .{lines.items[0]});
     for (lines.items[1..]) |line| {

src/test.zig

@@ -2,6 +2,7 @@ const std = @import("std");
 const testing = std.testing;
 
 const Allocator = std.mem.Allocator;
+const Dir = std.Io.Dir;
 
 const lib = @import("lib.zig");
 
@@ -15,11 +16,12 @@ fn expectDep(alc: Allocator, dep: lib.Dependency, url: []const u8, hash: []const
 
 test "Dependency Parsing" {
     const alc = testing.allocator;
+    const io = testing.io;
 
-    const file = try std.fs.cwd().openFile("src/test_examples/build.zig.zon", .{});
-    defer file.close();
+    const file = try Dir.cwd().openFile(io, "src/test_examples/build.zig.zon", .{});
+    defer file.close(io);
 
-    var dep_iter = try lib.ZonDependencyIterator.init(alc, &file) orelse return error.InvalidExample;
+    var dep_iter = try lib.ZonDependencyIterator.init(alc, &file, io) orelse return error.InvalidExample;
     defer dep_iter.deinit(alc);
 
     var dep = dep_iter.next() orelse return error.CannotFindDep1;