From 5fa13625a1ca0ea1a3a1c5bb86d0880dcfac349f Mon Sep 17 00:00:00 2001 From: Dylan Conway <35280289+dylan-conway@users.noreply.github.com> Date: Wed, 21 Jun 2023 23:38:18 -0700 Subject: upgrade zig to `v0.11.0-dev.3737+9eb008717` (#3374) * progress * finish `@memset/@memcpy` update * Update build.zig * change `@enumToInt` to `@intFromEnum` and friends * update zig versions * it was 1 * add link to issue * add `compileError` reminder * fix merge * format * upgrade to llvm 16 * Revert "upgrade to llvm 16" This reverts commit cc930ceb1c5b4db9614a7638596948f704544ab8. --------- Co-authored-by: Jarred Sumner Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> --- src/analytics/analytics_thread.zig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/analytics/analytics_thread.zig') diff --git a/src/analytics/analytics_thread.zig b/src/analytics/analytics_thread.zig index b6039d3a7..998f5cfc2 100644 --- a/src/analytics/analytics_thread.zig +++ b/src/analytics/analytics_thread.zig @@ -261,7 +261,7 @@ pub const GenerateHeader = struct { pub const GeneratePlatform = struct { var osversion_name: [32]u8 = undefined; pub fn forMac() Analytics.Platform { - @memset(&osversion_name, 0, osversion_name.len); + @memset(&osversion_name, 0); var platform = Analytics.Platform{ .os = Analytics.OperatingSystem.macos, .version = &[_]u8{}, .arch = platform_arch }; var len = osversion_name.len - 1; @@ -340,7 +340,7 @@ pub const GenerateHeader = struct { offset = std.mem.indexOfScalar(u8, out, '"') orelse return Analytics.Uint64{}; out = out[0..offset]; - const hash = std.hash.Wyhash.hash(0, std.mem.trim(u8, out, "\n\r ")); + const hash = bun.hash(std.mem.trim(u8, out, "\n\r ")); var hash_bytes = std.mem.asBytes(&hash); return Analytics.Uint64{ .first = std.mem.readIntNative(u32, hash_bytes[0..4]), @@ -357,7 +357,7 @@ pub const GenerateHeader = struct { defer file.close(); var read_count = try file.read(&linux_machine_id); - const hash = std.hash.Wyhash.hash(0, std.mem.trim(u8, linux_machine_id[0..read_count], "\n\r ")); + const hash = bun.hash(std.mem.trim(u8, linux_machine_id[0..read_count], "\n\r ")); var hash_bytes = std.mem.asBytes(&hash); return Analytics.Uint64{ .first = std.mem.readIntNative(u32, hash_bytes[0..4]), @@ -540,8 +540,8 @@ pub const EventList = struct { } @atomicStore(bool, &is_stuck, retry_remaining == 0, .Release); - stuck_count += @intCast(u8, @boolToInt(retry_remaining == 0)); - stuck_count *= @intCast(u8, @boolToInt(retry_remaining == 0)); + stuck_count += @intCast(u8, @intFromBool(retry_remaining == 0)); + stuck_count *= @intCast(u8, @intFromBool(retry_remaining == 0)); disabled = disabled or stuck_count > 4; this.in_buffer.reset(); -- cgit v1.2.3