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/http/websocket.zig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/http/websocket.zig') diff --git a/src/http/websocket.zig b/src/http/websocket.zig index 98410d57c..48a4cebf5 100644 --- a/src/http/websocket.zig +++ b/src/http/websocket.zig @@ -34,7 +34,7 @@ pub const Opcode = enum(u4) { ResF = 0xF, pub fn isControl(opcode: Opcode) bool { - return @enumToInt(opcode) & 0x8 != 0; + return @intFromEnum(opcode) & 0x8 != 0; } }; @@ -261,7 +261,7 @@ pub const Websocket = struct { } pub fn read(self: *Websocket) !WebsocketDataFrame { - @memset(&self.buf, 0, self.buf.len); + @memset(&self.buf, 0); // Read and retry if we hit the end of the stream buffer var start = try self.stream.read(&self.buf); @@ -274,7 +274,7 @@ pub const Websocket = struct { } pub fn eatAt(self: *Websocket, offset: usize, _len: usize) []u8 { - const len = std.math.min(self.read_stream.buffer.len, _len); + const len = @min(self.read_stream.buffer.len, _len); self.read_stream.pos = len; return self.read_stream.buffer[offset..len]; } @@ -292,7 +292,7 @@ pub const Websocket = struct { // header.rsv1 = header_bytes[0] & 0x40 == 0x40; // header.rsv2 = header_bytes[0] & 0x20; // header.rsv3 = header_bytes[0] & 0x10; - header.opcode = @intToEnum(Opcode, @truncate(u4, header_bytes[0])); + header.opcode = @enumFromInt(Opcode, @truncate(u4, header_bytes[0])); header.mask = header_bytes[1] & 0x80 == 0x80; header.len = @truncate(u7, header_bytes[1]); -- cgit v1.2.3