Merge pull request #1 from sea-grass/upgrade-to-zig-0.15.0-dev.377+f01833e03

Update to zig 0.15.0-dev.377+f01833e03

Author: robbielyman

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: mlugg/setup-zig@v1
         with:
-          version: 0.13.0
+          version: master
       - run: zig build release
       - name: zip artifact
         run: |

.github/workflows/test.yml

@@ -10,8 +10,9 @@ jobs:
       - uses: actions/checkout@v4
       - uses: mlugg/setup-zig@v1
         with:
-          version: 0.13.0
-      - uses: leafo/gh-actions-lua@v10
+          version: master
+      - uses: ilammy/msvc-dev-cmd@v1
+      - uses: leafo/gh-actions-lua@v11
         with:
           luaVersion: "5.4.7"
       - uses: luarocks/gh-actions-luarocks@v5
@@ -29,5 +30,5 @@ jobs:
       - uses: actions/checkout@v4
       - uses: mlugg/setup-zig@v1
         with:
-          version: 0.13.0
+          version: master
       - run: zig fmt --check .

build.zig

@@ -1,5 +1,5 @@
 const std = @import("std");
-const e = @import("embed-file");
+const e = @import("embed_file");
 
 const Dep = struct {
     name: []const u8,
@@ -37,7 +37,7 @@ pub fn build(b: *std.Build) !void {
         .optimize = optimize,
         .link_libc = true,
     });
-    for (deps) |dep| dep.addImport(&lib.root_module);
+    for (deps) |dep| dep.addImport(lib.root_module);
     const lib_install = b.addInstallFileWithDir(
         lib.getEmittedBin(),
         .lib,
@@ -53,15 +53,15 @@ pub fn build(b: *std.Build) !void {
         .target = target,
         .optimize = optimize,
     });
-    for (deps) |dep| dep.addImport(&exe.root_module);
+    for (deps) |dep| dep.addImport(exe.root_module);
     b.installArtifact(exe);
 
     const tests = b.addTest(.{
         .target = target,
         .optimize = optimize,
         .root_source_file = b.path("src/main.zig"),
     });
-    for (deps) |dep| dep.addImport(&tests.root_module);
+    for (deps) |dep| dep.addImport(tests.root_module);
     const tests_run = b.addRunArtifact(tests);
 
     const tests_step = b.step("test", "test seamstress");
@@ -86,8 +86,8 @@ pub fn build(b: *std.Build) !void {
         .optimize = optimize,
     });
     for (deps) |dep| {
-        dep.addImport(&root_comp_check.root_module);
-        dep.addImport(&comp_check.root_module);
+        dep.addImport(root_comp_check.root_module);
+        dep.addImport(comp_check.root_module);
     }
     const check = b.step("check", "check for compile errors");
     check.dependOn(&comp_check.step);
@@ -125,7 +125,7 @@ pub fn build(b: *std.Build) !void {
             .target = t,
             .optimize = release_mode,
         });
-        for (target_deps) |dep| dep.addImport(&release_exe.root_module);
+        for (target_deps) |dep| dep.addImport(release_exe.root_module);
 
         const target_output = b.addInstallArtifact(release_exe, .{
             .dest_dir = .{ .override = .{
@@ -140,16 +140,16 @@ pub fn build(b: *std.Build) !void {
 }
 
 fn createImports(b: *std.Build, options: Options) []const Dep {
-    var list: std.ArrayListUnmanaged(Dep) = .{};
+    var list: std.ArrayListUnmanaged(Dep) = .empty;
     list.ensureTotalCapacity(b.allocator, 5) catch @panic("OOM");
 
     const assets = b.createModule(.{
-        .root_source_file = b.addWriteFile("module.zig",
+        .root_source_file = b.addWriteFiles().add("module.zig",
             \\pub const lua = @import("lua");
             \\pub const @"test" = @import("test");
             \\pub const version = @import("version").version;
             \\
-        ).files.items[0].getPath(),
+        ),
     });
     {
         const lua_files: []const []const u8 = &.{
@@ -174,7 +174,7 @@ fn createImports(b: *std.Build, options: Options) []const Dep {
     {
         const ef = e.addEmbedFiles(b);
         ef.addFile(b.path("version.txt"), "semver-str", null);
-        const wf_module = b.addWriteFile("version.zig",
+        const wf_module = b.addWriteFiles().add("version.zig",
             \\const semver_str = str: {
             \\    const str = @import("semver-str").@"semver-str";
             \\    if (std.mem.indexOfAny(u8, &str, "\r\n \t")) |idx| break :str str[0..idx];
@@ -187,13 +187,13 @@ fn createImports(b: *std.Build, options: Options) []const Dep {
             \\    @compileLog("error: ", err);
             \\    @compileError("semantic version string failed to parse!");
             \\};
-        ).files.items[0].getPath();
+        );
         const version = b.createModule(.{ .root_source_file = wf_module });
         version.addImport("semver-str", ef.module);
         assets.addImport("version", version);
     }
 
-    const ziglua = b.dependency("ziglua", .{
+    const zlua = b.dependency("zlua", .{
         .target = options.target,
         .optimize = options.optimize,
     });
@@ -205,11 +205,11 @@ fn createImports(b: *std.Build, options: Options) []const Dep {
         .target = options.target,
         .optimize = options.optimize,
     });
-    const @"known-folders" = b.dependency("known-folders", .{});
-    list.appendAssumeCapacity(.{ .module = ziglua.module("ziglua"), .name = "ziglua" });
+    const known_folders = b.dependency("known_folders", .{});
+    list.appendAssumeCapacity(.{ .module = zlua.module("zlua"), .name = "zlua" });
     list.appendAssumeCapacity(.{ .module = xev.module("xev"), .name = "xev" });
     list.appendAssumeCapacity(.{ .module = zosc.module("zosc"), .name = "zosc" });
-    list.appendAssumeCapacity(.{ .module = @"known-folders".module("known-folders"), .name = "known-folders" });
+    list.appendAssumeCapacity(.{ .module = known_folders.module("known-folders"), .name = "known-folders" });
     list.appendAssumeCapacity(.{ .module = assets, .name = "assets" });
     return list.items;
 }

build.zig.zon

@@ -1,27 +1,28 @@
 .{
-    .name = "seamstress",
+    .name = .steamstress,
     .version = "2.0.0-prealpha-3",
+    .fingerprint = 0xd0e1bb1829aedf14,
     .paths = .{ "build.zig.zon", "build.zig", "src", "lua" },
     .dependencies = .{
-        .ziglua = .{
-            .url = "git+https://github.com/robbielyman/ziglua?ref=byo-lua#69a86667f31257e8529a3d20e1799283984bead5",
-            .hash = "12202e945f7d80689f48333beefd8a1993f3a67ca6af400d9c746f1a121fc7cb78fa",
+        .zlua = .{
+            .url = "git+https://github.com/natecraddock/ziglua#f7b3c90d026afd33b0a70debfd54ea50f1acfc1b",
+            .hash = "zlua-0.1.0-hGRpC-IZBQDD9MfKTbeRE3z_Qg-kI2SqnT1JaRl9W9Sq",
         },
         .libxev = .{
-            .url = "git+https://github.com/robbielyman/libxev?ref=seamstress-branch#8cfc85b21974996775d7ca8a4febc5d0963e6f7f",
-            .hash = "1220c9e5ef90baa4bcc9ceb73edf54961ca4de5d0bcebec6aff38a20079947b04682",
+            .url = "git+https://github.com/mitchellh/libxev?ref=main#94ed6af7b2aaaeab987fbf87fcee410063df715b",
+            .hash = "libxev-0.0.0-86vtc-zkEgB7uv1i0Sa6ytJETZQi_lHJrImu9mLb9moi",
         },
         .zosc = .{
-            .url = "git+https://github.com/robbielyman/zosc?ref=v1.1.0#ef8caf3c9f86b09b7fbed9fe6d4cdba3a43fb9de",
-            .hash = "12207c108f821340bc3514117afd24bace658bc3ad06b79c51d1440eb498cec4349c",
+            .url = "git+https://github.com/robbielyman/zosc?ref=main#574938ce59505e57df1ed7b22d505e84a4c6f051",
+            .hash = "zosc-0.1.0-Y0MRGIJmAQAp85zMQYfekmcK-CPy2U1bNAN3H0-gH3XS",
         },
-        .@"embed-file" = .{
-            .url = "git+https://github.com/robbielyman/EmbedFile.zig#b5ae28c2812a510de762b41cea489aad80bc039a",
-            .hash = "1220633202df3bfbf2436d80dee0cf94b7eeab59177b4d777680f175a08fa8deaf41",
+        .embed_file = .{
+            .url = "git+https://github.com/robbielyman/EmbedFile.zig?ref=main#67d95b1a7db29bf80fe7db5daeb3878b1002f3e9",
+            .hash = "embed_file-1.0.0-xHnAJbRyAACyaZoX76xXnqJr8ZPsACm12-D4C_VIXEFc",
         },
-        .@"known-folders" = .{
-            .url = "git+https://github.com/ziglibs/known-folders#1cceeb70e77dec941a4178160ff6c8d05a74de6f",
-            .hash = "12205f5e7505c96573f6fc5144592ec38942fb0a326d692f9cddc0c7dd38f9028f29",
+        .known_folders = .{
+            .url = "git+https://github.com/ziglibs/known-folders?ref=master#aa24df42183ad415d10bc0a33e6238c437fc0f59",
+            .hash = "known_folders-0.0.0-Fy-PJtLDAADGDOwYwMkVydMSTp_aN-nfjCZw6qPQ2ECL",
         },
     },
 }

design.org

@@ -250,7 +250,7 @@ Here is an example from =cli.zig=:
   // l is the seamstress Lua environment.
   // self is a pointer to the CLI struct
   l.pushLightUserdata(self);
-  l.pushClosure(ziglua.wrap(struct {
+  l.pushClosure(zlua.wrap(struct {
       fn f(l: *Lua) i32 {
           const i = Lua.upvalueIndex(1);
           const cli = l.toUserdata(Cli, i) catch unreachable;

src/args.zig

@@ -1,10 +1,10 @@
 const Args = @This();
 
-logging: logging.Args,
+log: logging.Args,
 run: Seamstress.RunArgs,
 
 pub fn format(args: Args, comptime _: []const u8, _: std.fmt.FormatOptions, writer: anytype) !void {
-    try writer.print("log file: {s}, log level: {s}\n", .{ args.logging.path orelse "default", switch (args.logging.level) {
+    try writer.print("log file: {s}, log level: {s}\n", .{ args.log.path orelse "default", switch (args.log.level) {
         .err => "error",
         .warn => "warning",
         .info => "info",
@@ -67,7 +67,7 @@ pub fn process(cli_args: []const []const u8) Args {
         file = arg;
     }
     return .{
-        .logging = logging_arg,
+        .log = logging_arg,
         .run = .{
             .file = file,
             .tests = .{