From 10a0e0ab99e2beb084b8299ca198029d911b6961 Mon Sep 17 00:00:00 2001 From: Emil Lerch Date: Thu, 2 Oct 2025 08:15:38 -0700 Subject: [PATCH] adjust stack trace changes in zig 0.16.0-dev.565+f50c64797 --- .mise.toml | 2 +- src/aws.zig | 2 +- src/aws_credentials.zig | 6 +++--- src/aws_signing.zig | 2 +- src/aws_test.zig | 4 ++-- src/xml_shaper.zig | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.mise.toml b/.mise.toml index 52bb2e6..aeb1885 100644 --- a/.mise.toml +++ b/.mise.toml @@ -1,5 +1,5 @@ [tools] pre-commit = "latest" "ubi:DonIsaac/zlint" = "latest" -zig = "0.15.1" +zig = "master" zls = "0.15.0" diff --git a/src/aws.zig b/src/aws.zig index f764cce..9b332f6 100644 --- a/src/aws.zig +++ b/src/aws.zig @@ -455,7 +455,7 @@ pub fn Request(comptime request_action: anytype) type { log.err("Could not set header value: Response header {s}. Field {s}. Value {s}", .{ header.name, f.?.name, header.value }); log.err("Error: {}", .{e}); if (@errorReturnTrace()) |trace| { - std.debug.dumpStackTrace(trace.*); + std.debug.dumpStackTrace(trace); } }; diff --git a/src/aws_credentials.zig b/src/aws_credentials.zig index 11b620a..fb1f7ae 100644 --- a/src/aws_credentials.zig +++ b/src/aws_credentials.zig @@ -201,7 +201,7 @@ fn getContainerCredentials(allocator: std.mem.Allocator) !?auth.Credentials { log.err("Unexpected Json response from container credentials endpoint: {s}", .{aw.written()}); log.err("Error parsing json: {}", .{e}); if (@errorReturnTrace()) |trace| { - std.debug.dumpStackTrace(trace.*); + std.debug.dumpStackTrace(trace); } return null; @@ -299,7 +299,7 @@ fn getImdsRoleName(allocator: std.mem.Allocator, client: *std.http.Client, imds_ log.err("Unexpected Json response from IMDS endpoint: {s}", .{aw.written()}); log.err("Error parsing json: {}", .{e}); if (@errorReturnTrace()) |trace| { - std.debug.dumpStackTrace(trace.*); + std.debug.dumpStackTrace(trace); } return null; }; @@ -354,7 +354,7 @@ fn getImdsCredentials(allocator: std.mem.Allocator, client: *std.http.Client, ro log.err("Unexpected Json response from IMDS endpoint: {s}", .{aw.written()}); log.err("Error parsing json: {}", .{e}); if (@errorReturnTrace()) |trace| { - std.debug.dumpStackTrace(trace.*); + std.debug.dumpStackTrace(trace); } return null; diff --git a/src/aws_signing.zig b/src/aws_signing.zig index 1c60119..fa64788 100644 --- a/src/aws_signing.zig +++ b/src/aws_signing.zig @@ -334,7 +334,7 @@ pub fn freeSignedRequest(allocator: std.mem.Allocator, request: *base.Request, c validateConfig(config) catch |e| { log.err("Signing validation failed during signature free: {}", .{e}); if (@errorReturnTrace()) |trace| { - std.debug.dumpStackTrace(trace.*); + std.debug.dumpStackTrace(trace); } return; }; diff --git a/src/aws_test.zig b/src/aws_test.zig index 3e92483..7ea3e5d 100644 --- a/src/aws_test.zig +++ b/src/aws_test.zig @@ -333,14 +333,14 @@ const TestSetup = struct { var stderr = std.fs.File.stderr().writer(&.{}); stderr.interface.writeAll(r.trace) catch @panic("could not write to stderr"); std.debug.print("Current stack trace:\n", .{}); - std.debug.dumpCurrentStackTrace(null); + std.debug.dumpCurrentStackTrace(.{}); return error.ConnectionRefused; // we should not be called twice } const acts = try self.allocator.create(RequestActuals); errdefer self.allocator.destroy(acts); var aw = std.Io.Writer.Allocating.init(self.allocator); defer aw.deinit(); - std.debug.dumpCurrentStackTraceToWriter(null, &aw.writer) catch return error.OutOfMemory; + std.debug.writeCurrentStackTrace(.{}, &aw.writer, .no_color) catch return error.OutOfMemory; const req = try self.allocator.create(std.http.Client.Request); errdefer self.allocator.destroy(req); const reader = try self.allocator.create(std.Io.Reader); diff --git a/src/xml_shaper.zig b/src/xml_shaper.zig index 86789e9..6b33f77 100644 --- a/src/xml_shaper.zig +++ b/src/xml_shaper.zig @@ -168,7 +168,7 @@ fn parseInternal(comptime T: type, element: *xml.Element, options: ParseOptions) }, ); if (@errorReturnTrace()) |trace| { - std.debug.dumpStackTrace(trace.*); + std.debug.dumpStackTrace(trace); } } return e; @@ -193,7 +193,7 @@ fn parseInternal(comptime T: type, element: *xml.Element, options: ParseOptions) }, ); if (@errorReturnTrace()) |trace| { - std.debug.dumpStackTrace(trace.*); + std.debug.dumpStackTrace(trace); } } return e;