From 00f5b0c8d152af51ddf14601d62a9d5a61e646d9 Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Sun, 16 Feb 2025 01:14:07 -0800 Subject: [PATCH] upgrade to zig 0.14-dev.3224+5ab511307 --- deps.zig | 6 +++--- src/cmd/aq.zig | 2 +- src/cmd/aquila/add.zig | 2 +- src/cmd/aquila/install.zig | 2 +- src/cmd/aquila/showjson.zig | 2 +- src/cmd/aquila/update.zig | 2 +- src/cmd/ci.zig | 2 +- src/cmd/fetch.zig | 4 ++-- src/cmd/generate.zig | 6 +++--- src/cmd/init.zig | 2 +- src/cmd/license.zig | 2 +- src/cmd/sum.zig | 2 +- src/cmd/version.zig | 2 +- src/cmd/zpm.zig | 2 +- src/cmd/zpm/add.zig | 2 +- src/cmd/zpm/search.zig | 2 +- src/cmd/zpm/showjson.zig | 2 +- src/cmd/zpm/tags.zig | 2 +- 18 files changed, 23 insertions(+), 23 deletions(-) diff --git a/deps.zig b/deps.zig index 2fc62fee54b381a6976823433ace06e2a6d0a429..b1751827fbecc015e42602cce4e9c5a68265becc 100644 --- a/deps.zig +++ b/deps.zig @@ -40,9 +40,9 @@ pub const GitExactStep = struct { return result; } - fn make(step: *std.Build.Step, prog_node: std.Progress.Node) !void { + fn make(step: *std.Build.Step, options: std.Build.Step.MakeOptions) !void { _ = step; - _ = prog_node; + _ = options; } }; @@ -121,7 +121,7 @@ pub const Package = struct { const result = b.createModule(.{}); const dummy_library = b.addStaticLibrary(.{ .name = "dummy", - .target = exe.root_module.resolved_target orelse b.host, + .target = exe.root_module.resolved_target orelse b.graph.host, .optimize = exe.root_module.optimize.?, }); dummy_library.step.dependOn(fetch_step); diff --git a/src/cmd/aq.zig b/src/cmd/aq.zig index d77326e411939baa36ed94f6fcd0833b4acfaf21..2d9a7eca7d1056e7569c3782ebded0c8580bf185 100644 --- a/src/cmd/aq.zig +++ b/src/cmd/aq.zig @@ -19,7 +19,7 @@ pub const commands = struct { pub const server_root = "https://aquila.red"; -pub fn execute(self_name: []const u8, args: [][]u8) !void { +pub fn execute(self_name: []const u8, args: [][:0]u8) !void { if (args.len == 0) { std.debug.print("{s}\n", .{ \\This is a subcommand for use with https://github.com/nektro/aquila instances but has no default behavior on its own aside from showing you this nice help text. diff --git a/src/cmd/aquila/add.zig b/src/cmd/aquila/add.zig index cb80a69398d9c3c06d20f1dd2e00d346b2f903f2..c0d2f541f5082b120b72b6a5f7fc77ab1d602e08 100644 --- a/src/cmd/aquila/add.zig +++ b/src/cmd/aquila/add.zig @@ -8,7 +8,7 @@ const aq = @import("./../aq.zig"); // // -pub fn execute(self_name: []const u8, args: [][]u8) !void { +pub fn execute(self_name: []const u8, args: [][:0]u8) !void { _ = self_name; const pkg_id = args[0]; diff --git a/src/cmd/aquila/install.zig b/src/cmd/aquila/install.zig index b5b27c5c73538799f1390511170dfae1836103f8..9761fe199a055671b58dbbb32f6e3bfafe077d0f 100644 --- a/src/cmd/aquila/install.zig +++ b/src/cmd/aquila/install.zig @@ -8,7 +8,7 @@ const zigmod = @import("../../lib.zig"); const u = @import("./../../util/index.zig"); const common = @import("./../../common.zig"); -pub fn execute(self_name: []const u8, args: [][]u8) !void { +pub fn execute(self_name: []const u8, args: [][:0]u8) !void { _ = self_name; const home = try knownfolders.getPath(gpa, .home); diff --git a/src/cmd/aquila/showjson.zig b/src/cmd/aquila/showjson.zig index 68a3bfb2d7b1472d6ae2f5995f2c3a2916c73757..8cc9fcc52cb288fe7bc95d430f7dfcd7838879ea 100644 --- a/src/cmd/aquila/showjson.zig +++ b/src/cmd/aquila/showjson.zig @@ -6,7 +6,7 @@ const aq = @import("./../aq.zig"); // // -pub fn execute(self_name: []const u8, args: [][]u8) !void { +pub fn execute(self_name: []const u8, args: [][:0]u8) !void { _ = self_name; const out = std.io.getStdOut().writer(); diff --git a/src/cmd/aquila/update.zig b/src/cmd/aquila/update.zig index a989eda571aff084c4323fe9665d487b29dc3061..b1e201bba7f1be6c2f4042415b3edb33cbc13ce5 100644 --- a/src/cmd/aquila/update.zig +++ b/src/cmd/aquila/update.zig @@ -8,7 +8,7 @@ const zigmod = @import("../../lib.zig"); const u = @import("./../../util/index.zig"); const common = @import("./../../common.zig"); -pub fn execute(self_name: []const u8, args: [][]u8) !void { +pub fn execute(self_name: []const u8, args: [][:0]u8) !void { _ = self_name; const home = try knownfolders.getPath(gpa, .home); diff --git a/src/cmd/ci.zig b/src/cmd/ci.zig index 49979be23481205d03457a272ad6aaf7e07769ca..65c346ac63c659007a1b8fe73934388cf1812026 100644 --- a/src/cmd/ci.zig +++ b/src/cmd/ci.zig @@ -8,7 +8,7 @@ const common = @import("./../common.zig"); // Inspired by: // https://docs.npmjs.com/cli/v7/commands/npm-ci -pub fn execute(self_name: []const u8, args: [][]u8) !void { +pub fn execute(self_name: []const u8, args: [][:0]u8) !void { _ = self_name; _ = args; diff --git a/src/cmd/fetch.zig b/src/cmd/fetch.zig index f8f96441349f669f547904e094ab16458b740e41..7f62bb421cb6014434bd9ebc03fbc0773f543955 100644 --- a/src/cmd/fetch.zig +++ b/src/cmd/fetch.zig @@ -11,7 +11,7 @@ const license = @import("./license.zig"); // // -pub fn execute(self_name: []const u8, args: [][]u8) !void { +pub fn execute(self_name: []const u8, args: [][:0]u8) !void { _ = self_name; const gpa = std.heap.c_allocator; @@ -87,7 +87,7 @@ pub fn create_depszig(alloc: std.mem.Allocator, cachepath: string, dir: std.fs.D \\ } \\ const b = exe.step.owner; \\ const result = b.createModule(.{ - \\ .target = exe.root_module.resolved_target orelse b.host, + \\ .target = exe.root_module.resolved_target orelse b.graph.host, \\ }); \\ if (self.import) |capture| { \\ result.root_source_file = capture[1]; diff --git a/src/cmd/generate.zig b/src/cmd/generate.zig index 29c8758c0cd0ce5234266171d6b1b160c70e404d..4fe6cf7f4f054020bb6db3795e740ed4472384a5 100644 --- a/src/cmd/generate.zig +++ b/src/cmd/generate.zig @@ -9,7 +9,7 @@ const common = @import("./../common.zig"); // // -pub fn execute(self_name: []const u8, args: [][]u8) !void { +pub fn execute(self_name: []const u8, args: [][:0]u8) !void { _ = self_name; _ = args; @@ -83,9 +83,9 @@ pub fn create_depszig(alloc: std.mem.Allocator, cachepath: string, dir: std.fs.D \\ return result; \\ } \\ - \\ fn make(step: *std.Build.Step, prog_node: std.Progress.Node) !void { + \\ fn make(step: *std.Build.Step, options: std.Build.Step.MakeOptions) !void { \\ _ = step; - \\ _ = prog_node; + \\ _ = options; \\ } \\}; \\ diff --git a/src/cmd/init.zig b/src/cmd/init.zig index 1c34c715a49e9bc96ca6afba11e98e123d3fdf4c..7b2223a6b15c07a7f41ccfa32964c749bd7306bd 100644 --- a/src/cmd/init.zig +++ b/src/cmd/init.zig @@ -13,7 +13,7 @@ const u = @import("./../util/index.zig"); // // -pub fn execute(self_name: []const u8, args: [][]u8) !void { +pub fn execute(self_name: []const u8, args: [][:0]u8) !void { _ = self_name; std.debug.print("This utility will walk you through creating a zigmod.yml file.\n", .{}); diff --git a/src/cmd/license.zig b/src/cmd/license.zig index 9ba4d58b39bafb40977a6ef7b04a5a11f3dd5a05..eb99a4afca810fde221827840cff7850c0f491e1 100644 --- a/src/cmd/license.zig +++ b/src/cmd/license.zig @@ -15,7 +15,7 @@ const Map = std.StringArrayHashMap(*List); // Inspired by: // https://github.com/onur/cargo-license -pub fn execute(self_name: []const u8, args: [][]u8) !void { +pub fn execute(self_name: []const u8, args: [][:0]u8) !void { _ = self_name; _ = args; diff --git a/src/cmd/sum.zig b/src/cmd/sum.zig index da91051c127e5fd0bdf61c983867a789d9a47397..367bbc7fb2183aec2c298260813cc22a0b75440e 100644 --- a/src/cmd/sum.zig +++ b/src/cmd/sum.zig @@ -8,7 +8,7 @@ const common = @import("./../common.zig"); // // -pub fn execute(self_name: []const u8, args: [][]u8) !void { +pub fn execute(self_name: []const u8, args: [][:0]u8) !void { _ = self_name; _ = args; diff --git a/src/cmd/version.zig b/src/cmd/version.zig index 4fb8d88b42058038d6b88d14dcd5036fc5027641..115fb815205f1109a2ace883c1933f08644dcc46 100644 --- a/src/cmd/version.zig +++ b/src/cmd/version.zig @@ -7,7 +7,7 @@ const u = @import("./../util/index.zig"); // // -pub fn execute(self_name: []const u8, args: [][]u8) !void { +pub fn execute(self_name: []const u8, args: [][:0]u8) !void { _ = self_name; _ = args; diff --git a/src/cmd/zpm.zig b/src/cmd/zpm.zig index bdbabf9a40e71ef029dccffa3fd1be560b3e0988..cf801227b3b68fb82dca8cb976e7fdc971829ab0 100644 --- a/src/cmd/zpm.zig +++ b/src/cmd/zpm.zig @@ -30,7 +30,7 @@ pub const Package = struct { links: []const string, }; -pub fn execute(self_name: []const u8, args: [][]u8) !void { +pub fn execute(self_name: []const u8, args: [][:0]u8) !void { if (args.len == 0) { std.debug.print("{s}\n", .{ \\This is a subcommand for use with https://github.com/zigtools/zpm-server instances but has no default behavior on its own aside from showing you this nice help text. diff --git a/src/cmd/zpm/add.zig b/src/cmd/zpm/add.zig index b787517fddbebe80ec3388df68fd074a8f5debda..65f8fc284358e5e822f6dd524d3245e98fe1b3a2 100644 --- a/src/cmd/zpm/add.zig +++ b/src/cmd/zpm/add.zig @@ -10,7 +10,7 @@ const zpm = @import("./../zpm.zig"); // // -pub fn execute(self_name: []const u8, args: [][]u8) !void { +pub fn execute(self_name: []const u8, args: [][:0]u8) !void { _ = self_name; const url = try std.mem.join(gpa, "/", &.{ zpm.server_root, "packages" }); diff --git a/src/cmd/zpm/search.zig b/src/cmd/zpm/search.zig index af7268695bbfe598c1c6087ab0cc783fbaaa78c9..174d85c3bbade4e4568c42dd0279c38660f1f8db 100644 --- a/src/cmd/zpm/search.zig +++ b/src/cmd/zpm/search.zig @@ -7,7 +7,7 @@ const zpm = @import("./../zpm.zig"); // // -pub fn execute(self_name: []const u8, args: [][]u8) !void { +pub fn execute(self_name: []const u8, args: [][:0]u8) !void { _ = self_name; _ = args; diff --git a/src/cmd/zpm/showjson.zig b/src/cmd/zpm/showjson.zig index dbbef7e1e7ff47b07a7c5d837a2575cb81e8ddd7..b6be07131f6d46e56055784c766464e3a1666415 100644 --- a/src/cmd/zpm/showjson.zig +++ b/src/cmd/zpm/showjson.zig @@ -6,7 +6,7 @@ const zpm = @import("./../zpm.zig"); // // -pub fn execute(self_name: []const u8, args: [][]u8) !void { +pub fn execute(self_name: []const u8, args: [][:0]u8) !void { _ = self_name; const out = std.io.getStdOut().writer(); diff --git a/src/cmd/zpm/tags.zig b/src/cmd/zpm/tags.zig index a798a15a002135f138e389a9ddf520e5c0233b54..789d284445742517e6ef6d1c69d0ee25cb022100 100644 --- a/src/cmd/zpm/tags.zig +++ b/src/cmd/zpm/tags.zig @@ -7,7 +7,7 @@ const zpm = @import("./../zpm.zig"); // // -pub fn execute(self_name: []const u8, args: [][]u8) !void { +pub fn execute(self_name: []const u8, args: [][:0]u8) !void { _ = self_name; _ = args; -- 2.54.0