From c0dd2841362b67fdb5ede262b19688004a4eb9a4 Mon Sep 17 00:00:00 2001 From: Jarred Sumner Date: Wed, 28 Dec 2022 00:51:22 -0800 Subject: Upgrade to latest Zig (#1610) * @min and @max * builtins and some trivial ones * Most of them * more * more! * More Progress * wip * Update tagged_pointer.zig * Update http_client_async.zig * Most of the iterable dir changes * alright * Remove usages of deprecated formatters * :camera: * fmt * Update shimmer.zig * wip * wip * wip * progress * more * Latest * stuck on error * latest * workaround stage2 * wip * Update string_immutable.zig * wip * Migrate `Dirent` and `require("fs')` to use JSC<>Zig bindings * Fix build errors * Fixup most of the test failures * Fix `make headers` * Fix "outside package path" error * Fixup aligned alloc * Add missing file * linux * More linux fixes * use latest peechy * Fix transpiler test failure * Forgot about these * Fixup test failure * Update node-timers.test.ts * [node:htt] Fix `undefined is not an object` error Fixes https://github.com/oven-sh/bun/issues/1618 * Update http.exports.js * Make this test less flaky * fix hashes * Fix hex formatting and zls issues * Download zig version * Update Dockerfile * Update Dockerfile * Update uws * Update Dockerfile * Set llvm version * Update README.md * Update uws * Update Dockerfile * Update io_linux.zig * Update bun.zig * Log output * workaround strange @cInclude error * Make ffi tests better * Don't use cImport * Update c.zig * Update c-bindings.cpp * call setOutputDir * Update Dockerfile * Use a longer name * latest * Update serve.test.ts Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> Co-authored-by: Veikka Tuominen --- src/analytics/analytics_schema.zig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/analytics') diff --git a/src/analytics/analytics_schema.zig b/src/analytics/analytics_schema.zig index b9d074249..825735331 100644 --- a/src/analytics/analytics_schema.zig +++ b/src/analytics/analytics_schema.zig @@ -17,7 +17,7 @@ pub const Reader = struct { } pub fn read(this: *Self, count: usize) ![]u8 { - const read_count = @minimum(count, this.remain.len); + const read_count = @min(count, this.remain.len); if (read_count < count) { return error.EOF; } @@ -58,7 +58,7 @@ pub const Reader = struct { return E.InvalidValue; } - pub inline fn readArray(this: *Self, comptime T: type) ![]const T { + pub fn readArray(this: *Self, comptime T: type) ![]const T { const length = try this.readInt(u32); if (length == 0) { return &([_]T{}); @@ -156,7 +156,7 @@ pub const Reader = struct { .Packed => { const sizeof = @sizeOf(T); var slice = try this.read(sizeof); - return @ptrCast(*T, slice[0..sizeof]).*; + return @ptrCast(*align(1) T, slice[0..sizeof]).*; }, else => {}, } @@ -263,7 +263,7 @@ pub fn Writer(comptime WritableStream: type) type { } } - pub inline fn writeArray(this: *Self, comptime T: type, slice: anytype) !void { + pub fn writeArray(this: *Self, comptime T: type, slice: anytype) !void { try this.writeInt(@truncate(u32, slice.len)); switch (T) { -- cgit v1.2.3