chore!: adjust for Zig 0.16 (#59)

Author: tranzystorekk

.github/workflows/cd.yml

@@ -54,7 +54,7 @@ jobs:
       - name: Install Zig
         uses: mlugg/setup-zig@v2
         with:
-          version: 0.14.0
+          version: 0.16.0
 
       - name: Show Zig version
         run: |

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Install Zig
         uses: mlugg/setup-zig@v2
         with:
-          version: 0.14.0
+          version: 0.16.0
 
       - name: Show Zig version
         run: |
@@ -54,7 +54,7 @@ jobs:
       - name: Install Zig
         uses: mlugg/setup-zig@v2
         with:
-          version: 0.14.0
+          version: 0.16.0
 
       - name: Install kcov
         run: |
@@ -86,7 +86,7 @@ jobs:
       - name: Install Zig
         uses: mlugg/setup-zig@v2
         with:
-          version: 0.14.0
+          version: 0.16.0
 
       - name: Check formatting
         run: zig fmt --check .

.github/workflows/pages.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Install Zig
         uses: mlugg/setup-zig@v2
         with:
-          version: 0.14.0
+          version: 0.16.0
 
       - name: Show Zig version
         run: |

.gitignore

@@ -7,6 +7,7 @@
 zig-cache/
 .zig-cache/
 zig-out/
+zig-pkg/
 build/
 build-*/
 docgen_tmp/

Dockerfile

@@ -1,4 +1,4 @@
-FROM eloitor/zig:0.14.0 as builder
+FROM eloitor/zig:0.16.0 AS builder
 RUN apk update
 RUN apk add --no-cache git
 WORKDIR /app

README.md

@@ -67,7 +67,7 @@
 
 #### Prerequisites
 
-- [Zig](https://ziglang.org/download/) (`0.14`)
+- [Zig](https://ziglang.org/download/) (`0.16`)
 
 #### Instructions
 

build.zig.zon

@@ -2,7 +2,7 @@
     .name = .linuxwave,
     .version = "0.1.5",
     .fingerprint = 0x217eafdf4732b5f9,
-    .minimum_zig_version = "0.14.0",
+    .minimum_zig_version = "0.16.0",
     .paths = .{
         "build.zig",
         "build.zig.zon",
@@ -12,8 +12,8 @@
     },
     .dependencies = .{
         .clap = .{
-            .url = "https://github.com/Hejsil/zig-clap/archive/refs/tags/0.10.0.tar.gz",
-            .hash = "clap-0.10.0-oBajB434AQBDh-Ei3YtoKIRxZacVPF1iSwp3IX_ZB8f0",
+            .url = "https://github.com/Hejsil/zig-clap/archive/refs/tags/0.12.0.tar.gz",
+            .hash = "clap-0.12.0-oBajB7foAQDqlSwaSG5g0yq7xGbQARUsBk5T64gAOqP5",
         },
     },
 }

src/file.zig

@@ -4,30 +4,34 @@ const std = @import("std");
 
 /// Reads the given file and returns a byte array with the length of `len`.
 pub fn readBytes(
+    io: std.Io,
     allocator: std.mem.Allocator,
     path: []const u8,
     len: usize,
 ) ![]u8 {
-    const file = try std.fs.cwd().openFile(path, .{});
-    defer file.close();
-    var list = try std.ArrayList(u8).initCapacity(allocator, len);
-    var buffer = list.allocatedSlice();
-    const bytes_read = try file.read(buffer);
-    return buffer[0..bytes_read];
+    const file = try std.Io.Dir.cwd().openFile(io, path, .{});
+    defer file.close(io);
+    var read_buffer: [1024]u8 = undefined;
+    var file_reader = file.reader(io, &read_buffer);
+    const reader = &file_reader.interface;
+    return reader.readAlloc(allocator, len);
 }
 
 test "read bytes from the file" {
+    const allocator = std.testing.allocator;
+    const io = std.testing.io;
+
     // Get the current directory.
     var cwd_buffer: [std.fs.max_path_bytes]u8 = undefined;
-    const cwd = try std.posix.getcwd(&cwd_buffer);
+    const cwd_len = try std.process.currentPath(io, &cwd_buffer);
+    const cwd = cwd_buffer[0..cwd_len];
 
     // Concatenate the current directory with the builder file.
-    const allocator = std.testing.allocator;
     const path = try std.fs.path.join(allocator, &.{ cwd, "build.zig" });
     defer allocator.free(path);
 
     // Read the contents of the file and compare.
-    const bytes = try readBytes(allocator, path, 9);
+    const bytes = try readBytes(io, allocator, path, 9);
     try std.testing.expectEqualStrings("const std", bytes);
     defer allocator.free(bytes);
 }

src/gen.zig

@@ -31,7 +31,7 @@ pub const Generator = struct {
     ///
     /// Returns an array that contains the amplitudes of the sound wave at a given point in time.
     pub fn generate(self: Generator, allocator: std.mem.Allocator, sample: u8) ![]u8 {
-        var buffer = std.ArrayList(u8).init(allocator);
+        var buffer: std.ArrayList(u8) = .empty;
         var i: usize = 0;
         while (i < sample_count) : (i += 1) {
             // Calculate the frequency according to the equal temperament.
@@ -45,9 +45,9 @@ pub const Generator = struct {
             // Apply the volume control.
             const volume: f32 = @floatFromInt(self.config.volume);
             amp = amp * volume / 100;
-            try buffer.append(@intFromFloat(amp));
+            try buffer.append(allocator, @trunc(amp));
         }
-        return buffer.toOwnedSlice();
+        return buffer.toOwnedSlice(allocator);
     }
 };
 

src/main.zig

@@ -8,33 +8,37 @@ const build_options = @import("build_options");
 const clap = @import("clap");
 
 /// Runs `linuxwave`.
-fn run(allocator: std.mem.Allocator, output: anytype) !void {
+fn run(io: std.Io, allocator: std.mem.Allocator, output: *std.Io.Writer, argv: std.process.Args) !void {
     // Parse command-line arguments.
-    const cli = try clap.parse(clap.Help, &args.params, args.parsers, .{ .allocator = allocator });
+    const cli = try clap.parse(clap.Help, &args.params, args.parsers, argv, .{ .allocator = allocator });
     defer cli.deinit();
     if (cli.args.help != 0) {
         try output.print("{s}\n", .{args.banner});
-        return clap.help(output, clap.Help, &args.params, args.help_options);
-    } else if (cli.args.version != 0) {
+        try clap.help(output, clap.Help, &args.params, args.help_options);
+        try output.flush();
+        return;
+    }
+    if (cli.args.version != 0) {
         try output.print("{s} {s}\n", .{ build_options.exe_name, build_options.version });
+        try output.flush();
         return;
     }
 
     // Create encoder configuration.
-    const encoder_config = wav.EncoderConfig{
+    const encoder_config: wav.EncoderConfig = .{
         .num_channels = if (cli.args.channels) |channels| channels else defaults.channels,
         .sample_rate = if (cli.args.rate) |rate| @intFromFloat(rate) else defaults.sample_rate,
         .format = if (cli.args.format) |format| format else defaults.format,
     };
 
     // Create generator configuration.
     const scale = s: {
-        var scale = std.ArrayList(u8).init(allocator);
+        var scale: std.ArrayList(u8) = .empty;
         var splits = std.mem.splitAny(u8, if (cli.args.scale) |s| s else defaults.scale, ",");
         while (splits.next()) |chunk| {
-            try scale.append(try std.fmt.parseInt(u8, chunk, 0));
+            try scale.append(allocator, try std.fmt.parseInt(u8, chunk, 0));
         }
-        break :s try scale.toOwnedSlice();
+        break :s try scale.toOwnedSlice(allocator);
     };
     defer allocator.free(scale);
     const generator_config = gen.GeneratorConfig{
@@ -50,63 +54,76 @@ fn run(allocator: std.mem.Allocator, output: anytype) !void {
     const buffer = b: {
         if (std.mem.eql(u8, input_file, "-")) {
             try output.print("Reading {d} bytes from stdin\n", .{data_len});
-            var list = try std.ArrayList(u8).initCapacity(allocator, data_len);
-            const buffer = list.allocatedSlice();
-            const stdin = std.io.getStdIn().reader();
-            try stdin.readNoEof(buffer);
-            break :b buffer;
-        } else {
-            try output.print("Reading {d} bytes from {s}\n", .{ data_len, input_file });
-            break :b try file.readBytes(allocator, input_file, data_len);
+            try output.flush();
+            var read_buffer: [1024]u8 = undefined;
+            var stdin_reader = std.Io.File.stdin().reader(io, &read_buffer);
+            const stdin = &stdin_reader.interface;
+            break :b try stdin.readAlloc(allocator, data_len);
         }
+
+        try output.print("Reading {d} bytes from {s}\n", .{ data_len, input_file });
+        try output.flush();
+        break :b try file.readBytes(io, allocator, input_file, data_len);
     };
     defer allocator.free(buffer);
 
     // Generate music.
-    const generator = gen.Generator.init(generator_config);
-    var data = std.ArrayList(u8).init(allocator);
+    const generator: gen.Generator = .init(generator_config);
+    var data: std.ArrayList(u8) = .empty;
     for (buffer) |v| {
         const gen_data = try generator.generate(allocator, v);
         defer allocator.free(gen_data);
-        try data.appendSlice(gen_data);
+        try data.appendSlice(allocator, gen_data);
     }
 
     // Encode WAV.
     const out = if (cli.args.output) |out| out else defaults.output;
-    const writer = w: {
+    var write_buffer: [1024]u8 = undefined;
+    var fhandle: ?std.Io.File = null;
+    defer if (fhandle) |f| {
+        f.close(io);
+    };
+    var file_writer = w: {
         if (std.mem.eql(u8, out, "-")) {
             try output.print("Writing to stdout\n", .{});
-            break :w std.io.getStdOut().writer();
-        } else {
-            try output.print("Saving to {s}\n", .{out});
-            const out_file = try std.fs.cwd().createFile(out, .{});
-            break :w out_file.writer();
+            try output.flush();
+            break :w std.Io.File.stdout().writer(io, &write_buffer);
         }
+
+        try output.print("Saving to {s}\n", .{out});
+        try output.flush();
+        fhandle = try std.Io.Dir.cwd().createFile(io, out, .{});
+        break :w fhandle.?.writer(io, &write_buffer);
     };
-    const wav_data = try data.toOwnedSlice();
+    const wav_data = try data.toOwnedSlice(allocator);
     defer allocator.free(wav_data);
-    try wav.Encoder(@TypeOf(writer)).encode(writer, wav_data, encoder_config);
+    try wav.encode(&file_writer.interface, wav_data, encoder_config);
 }
 
 /// Entry-point.
-pub fn main() !void {
-    var gpa = std.heap.GeneralPurposeAllocator(.{}){};
-    const allocator = gpa.allocator();
-    const stderr = std.io.getStdErr().writer();
-    run(allocator, stderr) catch |err| {
+pub fn main(init: std.process.Init) !void {
+    const allocator = init.gpa;
+    const io = init.io;
+    var stderr_buffer: [1024]u8 = undefined;
+    var stderr_writer = std.Io.File.stderr().writer(io, &stderr_buffer);
+    const stderr = &stderr_writer.interface;
+    run(io, allocator, stderr, init.minimal.args) catch |err| {
         try stderr.print("Error occurred: {}\n", .{err});
+        try stderr.flush();
     };
 }
 
 test "run" {
     const allocator = std.testing.allocator;
-    var buffer = std.ArrayList(u8).init(allocator);
-    const output = buffer.writer();
-    run(allocator, output) catch |err| {
+    const io = std.testing.io;
+
+    const fake_args: std.process.Args = .{ .vector = &[_][*:0]const u8{} };
+    var allocating: std.Io.Writer.Allocating = .init(allocator);
+    run(io, allocator, &allocating.writer, fake_args) catch |err| {
         std.debug.print("Error occurred: {s}\n", .{@errorName(err)});
         return;
     };
-    const result = buffer.toOwnedSlice() catch |err| {
+    const result = allocating.toOwnedSlice() catch |err| {
         std.debug.print("Error occurred: {s}\n", .{@errorName(err)});
         return;
     };