Skip to content

Commit 4841cda

Browse files
committed
Fix compiler errors for latest zig changes
1 parent f95c126 commit 4841cda

4 files changed

Lines changed: 17 additions & 6 deletions

File tree

src/app_runner.zig

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,13 @@ pub const AppRunner = struct {
7676
processError(&printer, err, cr.error_data orelse unreachable, app);
7777
if (app.help_config.print_help_on_error) {
7878
printer.printNewLine();
79-
try help.print_command_help(&printer, app, try cr.command_path.toOwnedSlice(self.orig_allocator), cr.global_options);
79+
try help.print_command_help(
80+
&printer,
81+
app,
82+
try cr.command_path.toOwnedSlice(self.orig_allocator),
83+
cr.global_options,
84+
self.orig_allocator,
85+
);
8086
}
8187
std.process.exit(1);
8288
}

src/help.zig

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@ pub fn print_command_help(
1414
app: *const command.App,
1515
command_path: []const *const command.Command,
1616
global_options: *const GlobalOptions,
17+
alloc: Allocator,
1718
) !void {
18-
var gpa = std.heap.GeneralPurposeAllocator(.{}){};
19-
const allocator = gpa.allocator();
20-
var arena = std.heap.ArenaAllocator.init(allocator);
19+
var arena = std.heap.ArenaAllocator.init(alloc);
2120
defer arena.deinit();
2221

2322
defer printer.flush();

src/parser.zig

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,13 @@ pub fn Parser(comptime Iterator: type) type {
263263
var buf: [4096]u8 = undefined;
264264
var writer = std.Io.File.stdout().writer(self.io, &buf);
265265
var printer = Printer.init(&writer);
266-
try help.print_command_help(&printer, self.app, try self.command_path.toOwnedSlice(self.orig_allocator), self.global_options);
266+
try help.print_command_help(
267+
&printer,
268+
self.app,
269+
try self.command_path.toOwnedSlice(self.orig_allocator),
270+
self.global_options,
271+
self.arena.child_allocator,
272+
);
267273
std.process.exit(0);
268274
}
269275

src/value_ref.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ const ValueList = struct {
105105
const gen = struct {
106106
fn createList(alloc: Allocator) Allocator.Error!*anyopaque {
107107
const list = try alloc.create(List);
108-
list.* = List{};
108+
list.* = .empty;
109109
return list;
110110
}
111111
fn addOne(list_ptr: *anyopaque, alloc: Allocator) Allocator.Error!*anyopaque {

0 commit comments

Comments
 (0)