From d30771ecffb501512cec5ae43d085560e9d61478 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 8 Jul 2025 10:02:06 -0700 Subject: [PATCH] pkg/macos: use new @ptrcast for os.log --- pkg/macos/os/log.zig | 10 +++++++--- src/benchmark/Benchmark.zig | 2 +- src/main_bench.zig | 2 ++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkg/macos/os/log.zig b/pkg/macos/os/log.zig index 8a399b73e..32ecb3296 100644 --- a/pkg/macos/os/log.zig +++ b/pkg/macos/os/log.zig @@ -8,10 +8,10 @@ pub const Log = opaque { subsystem: [:0]const u8, category: [:0]const u8, ) *Log { - return @as(?*Log, @ptrFromInt(@intFromPtr(c.os_log_create( + return @ptrCast(c.os_log_create( subsystem.ptr, category.ptr, - )))).?; + ).?); } pub fn release(self: *Log) void { @@ -32,7 +32,11 @@ pub const Log = opaque { comptime format: []const u8, args: anytype, ) void { - const str = nosuspend std.fmt.allocPrintZ(alloc, format, args) catch return; + const str = nosuspend std.fmt.allocPrintZ( + alloc, + format, + args, + ) catch return; defer alloc.free(str); zig_os_log_with_type(self, typ, str.ptr); } diff --git a/src/benchmark/Benchmark.zig b/src/benchmark/Benchmark.zig index b7d9b6ad3..0bc7539a8 100644 --- a/src/benchmark/Benchmark.zig +++ b/src/benchmark/Benchmark.zig @@ -50,7 +50,7 @@ pub fn run( build_config.bundle_id, macos.os.signpost.Category.points_of_interest, ); - const id = macos.os.signpost.Id.generate(log); + const id = macos.os.signpost.Id.forPointer(log, self.ptr); macos.os.signpost.intervalBegin(log, id, signpost_name); break :macos .{ .log = log, .id = id }; } else {}; diff --git a/src/main_bench.zig b/src/main_bench.zig index 9e4af1fc7..2314dc2ed 100644 --- a/src/main_bench.zig +++ b/src/main_bench.zig @@ -1,3 +1,5 @@ const std = @import("std"); +const builtin = @import("builtin"); const benchmark = @import("benchmark/main.zig"); + pub const main = benchmark.cli.main;