From de4926d87d495168755974fb9976e51478029e74 Mon Sep 17 00:00:00 2001 From: Karl Seguin Date: Wed, 14 Jan 2026 17:49:27 +0800 Subject: [PATCH] fix legacy runner, manual merge --- src/browser/webapi/IntersectionObserver.zig | 6 +++--- src/browser/webapi/MutationObserver.zig | 6 +++--- src/browser/webapi/PerformanceObserver.zig | 6 +++--- src/main_legacy_test.zig | 5 ++--- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/browser/webapi/IntersectionObserver.zig b/src/browser/webapi/IntersectionObserver.zig index e5be96fc..ea7fecf5 100644 --- a/src/browser/webapi/IntersectionObserver.zig +++ b/src/browser/webapi/IntersectionObserver.zig @@ -245,9 +245,9 @@ pub fn deliverEntries(self: *IntersectionObserver, page: *Page) !void { } const entries = try self.takeRecords(page); - var result: js.Function.Result = undefined; - self._callback.tryCall(void, .{ entries, self }, &result) catch |err| { - log.err(.page, "IntsctObserver.deliverEntries", .{ .err = result.exception, .stack = result.stack }); + var caught: js.TryCatch.Caught = undefined; + self._callback.tryCall(void, .{ entries, self }, &caught) catch |err| { + log.err(.page, "IntsctObserver.deliverEntries", .{ .err = err, .caught = caught }); return err; }; } diff --git a/src/browser/webapi/MutationObserver.zig b/src/browser/webapi/MutationObserver.zig index d496406f..168b4dca 100644 --- a/src/browser/webapi/MutationObserver.zig +++ b/src/browser/webapi/MutationObserver.zig @@ -248,9 +248,9 @@ pub fn deliverRecords(self: *MutationObserver, page: *Page) !void { // Take a copy of the records and clear the list before calling callback // This ensures mutations triggered during the callback go into a fresh list const records = try self.takeRecords(page); - var result: js.Function.Result = undefined; - self._callback.tryCall(void, .{ records, self }, &result) catch |err| { - log.err(.page, "MutObserver.deliverRecords", .{ .err = result.exception, .stack = result.stack }); + var caught: js.TryCatch.Caught = undefined; + self._callback.tryCall(void, .{ records, self }, &caught) catch |err| { + log.err(.page, "MutObserver.deliverRecords", .{ .err = err, .caught = caught }); return err; }; } diff --git a/src/browser/webapi/PerformanceObserver.zig b/src/browser/webapi/PerformanceObserver.zig index d85fcb82..c23a559d 100644 --- a/src/browser/webapi/PerformanceObserver.zig +++ b/src/browser/webapi/PerformanceObserver.zig @@ -151,9 +151,9 @@ pub inline fn hasRecords(self: *const PerformanceObserver) bool { /// Runs the PerformanceObserver's callback with records; emptying it out. pub fn dispatch(self: *PerformanceObserver, page: *Page) !void { const records = try self.takeRecords(page); - var result: js.Function.Result = undefined; - self._callback.tryCall(void, .{ EntryList{ ._entries = records }, self }, &result) catch |err| { - log.err(.page, "PerfObserver.dispatch", .{ .err = result.exception, .stack = result.stack }); + var caught: js.TryCatch.Caught = undefined; + self._callback.tryCall(void, .{ EntryList{ ._entries = records }, self }, &caught) catch |err| { + log.err(.page, "PerfObserver.dispatch", .{ .err = err, .caught = caught }); return err; }; } diff --git a/src/main_legacy_test.zig b/src/main_legacy_test.zig index 755da4a4..52d6137c 100644 --- a/src/main_legacy_test.zig +++ b/src/main_legacy_test.zig @@ -94,9 +94,8 @@ pub fn run(allocator: Allocator, file: []const u8, session: *lp.Session) !void { _ = session.wait(2000); js_context.eval("testing.assertOk()", "testing.assertOk()") catch |err| { - const msg = try_catch.err(allocator) catch @errorName(err) orelse "unknown"; - - std.debug.print("{s}: test failure\nError: {s}\n", .{ file, msg }); + const caught = try_catch.caughtOrError(allocator, err); + std.debug.print("{s}: test failure\nError: {f}\n", .{ file, caught }); return err; }; }