aboutsummaryrefslogtreecommitdiff
path: root/lib/std/http
diff options
context:
space:
mode:
Diffstat (limited to 'lib/std/http')
-rw-r--r--lib/std/http/Client.zig14
-rw-r--r--lib/std/http/Server.zig12
-rw-r--r--lib/std/http/protocol.zig48
3 files changed, 37 insertions, 37 deletions
diff --git a/lib/std/http/Client.zig b/lib/std/http/Client.zig
index 942ff4904d..db576e72b2 100644
--- a/lib/std/http/Client.zig
+++ b/lib/std/http/Client.zig
@@ -187,7 +187,7 @@ pub const Connection = struct {
const nread = try conn.rawReadAtLeast(conn.read_buf[0..], 1);
if (nread == 0) return error.EndOfStream;
conn.read_start = 0;
- conn.read_end = @intCast(u16, nread);
+ conn.read_end = @as(u16, @intCast(nread));
}
pub fn peek(conn: *Connection) []const u8 {
@@ -208,8 +208,8 @@ pub const Connection = struct {
if (available_read > available_buffer) { // partially read buffered data
@memcpy(buffer[out_index..], conn.read_buf[conn.read_start..conn.read_end][0..available_buffer]);
- out_index += @intCast(u16, available_buffer);
- conn.read_start += @intCast(u16, available_buffer);
+ out_index += @as(u16, @intCast(available_buffer));
+ conn.read_start += @as(u16, @intCast(available_buffer));
break;
} else if (available_read > 0) { // fully read buffered data
@@ -343,7 +343,7 @@ pub const Response = struct {
else => return error.HttpHeadersInvalid,
};
if (first_line[8] != ' ') return error.HttpHeadersInvalid;
- const status = @enumFromInt(http.Status, parseInt3(first_line[9..12].*));
+ const status = @as(http.Status, @enumFromInt(parseInt3(first_line[9..12].*)));
const reason = mem.trimLeft(u8, first_line[12..], " ");
res.version = version;
@@ -415,7 +415,7 @@ pub const Response = struct {
}
inline fn int64(array: *const [8]u8) u64 {
- return @bitCast(u64, array.*);
+ return @as(u64, @bitCast(array.*));
}
fn parseInt3(nnn: @Vector(3, u8)) u10 {
@@ -649,7 +649,7 @@ pub const Request = struct {
try req.connection.?.data.fill();
const nchecked = try req.response.parser.checkCompleteHead(req.client.allocator, req.connection.?.data.peek());
- req.connection.?.data.drop(@intCast(u16, nchecked));
+ req.connection.?.data.drop(@as(u16, @intCast(nchecked)));
if (req.response.parser.state.isContent()) break;
}
@@ -768,7 +768,7 @@ pub const Request = struct {
try req.connection.?.data.fill();
const nchecked = try req.response.parser.checkCompleteHead(req.client.allocator, req.connection.?.data.peek());
- req.connection.?.data.drop(@intCast(u16, nchecked));
+ req.connection.?.data.drop(@as(u16, @intCast(nchecked)));
}
if (has_trail) {
diff --git a/lib/std/http/Server.zig b/lib/std/http/Server.zig
index fe57b5735d..8c8661ee21 100644
--- a/lib/std/http/Server.zig
+++ b/lib/std/http/Server.zig
@@ -46,7 +46,7 @@ pub const Connection = struct {
const nread = try conn.rawReadAtLeast(conn.read_buf[0..], 1);
if (nread == 0) return error.EndOfStream;
conn.read_start = 0;
- conn.read_end = @intCast(u16, nread);
+ conn.read_end = @as(u16, @intCast(nread));
}
pub fn peek(conn: *Connection) []const u8 {
@@ -67,8 +67,8 @@ pub const Connection = struct {
if (available_read > available_buffer) { // partially read buffered data
@memcpy(buffer[out_index..], conn.read_buf[conn.read_start..conn.read_end][0..available_buffer]);
- out_index += @intCast(u16, available_buffer);
- conn.read_start += @intCast(u16, available_buffer);
+ out_index += @as(u16, @intCast(available_buffer));
+ conn.read_start += @as(u16, @intCast(available_buffer));
break;
} else if (available_read > 0) { // fully read buffered data
@@ -268,7 +268,7 @@ pub const Request = struct {
}
inline fn int64(array: *const [8]u8) u64 {
- return @bitCast(u64, array.*);
+ return @as(u64, @bitCast(array.*));
}
method: http.Method,
@@ -493,7 +493,7 @@ pub const Response = struct {
try res.connection.fill();
const nchecked = try res.request.parser.checkCompleteHead(res.allocator, res.connection.peek());
- res.connection.drop(@intCast(u16, nchecked));
+ res.connection.drop(@as(u16, @intCast(nchecked)));
if (res.request.parser.state.isContent()) break;
}
@@ -560,7 +560,7 @@ pub const Response = struct {
try res.connection.fill();
const nchecked = try res.request.parser.checkCompleteHead(res.allocator, res.connection.peek());
- res.connection.drop(@intCast(u16, nchecked));
+ res.connection.drop(@as(u16, @intCast(nchecked)));
}
if (has_trail) {
diff --git a/lib/std/http/protocol.zig b/lib/std/http/protocol.zig
index 6bafb08483..604267bf16 100644
--- a/lib/std/http/protocol.zig
+++ b/lib/std/http/protocol.zig
@@ -83,7 +83,7 @@ pub const HeadersParser = struct {
/// first byte of content is located at `bytes[result]`.
pub fn findHeadersEnd(r: *HeadersParser, bytes: []const u8) u32 {
const vector_len: comptime_int = comptime @max(std.simd.suggestVectorSize(u8) orelse 1, 8);
- const len = @intCast(u32, bytes.len);
+ const len = @as(u32, @intCast(bytes.len));
var index: u32 = 0;
while (true) {
@@ -182,8 +182,8 @@ pub const HeadersParser = struct {
const chunk = bytes[index..][0..vector_len];
const v: Vector = chunk.*;
- const matches_r = @bitCast(BitVector, v == @splat(vector_len, @as(u8, '\r')));
- const matches_n = @bitCast(BitVector, v == @splat(vector_len, @as(u8, '\n')));
+ const matches_r = @as(BitVector, @bitCast(v == @splat(vector_len, @as(u8, '\r'))));
+ const matches_n = @as(BitVector, @bitCast(v == @splat(vector_len, @as(u8, '\n'))));
const matches_or: SizeVector = matches_r | matches_n;
const matches = @reduce(.Add, matches_or);
@@ -234,7 +234,7 @@ pub const HeadersParser = struct {
},
4...vector_len => {
inline for (0..vector_len - 3) |i_usize| {
- const i = @truncate(u32, i_usize);
+ const i = @as(u32, @truncate(i_usize));
const b32 = int32(chunk[i..][0..4]);
const b16 = intShift(u16, b32);
@@ -405,10 +405,10 @@ pub const HeadersParser = struct {
/// If the amount returned is less than `bytes.len`, you may assume that the parser is in the `chunk_data` state
/// and that the first byte of the chunk is at `bytes[result]`.
pub fn findChunkedLen(r: *HeadersParser, bytes: []const u8) u32 {
- const len = @intCast(u32, bytes.len);
+ const len = @as(u32, @intCast(bytes.len));
for (bytes[0..], 0..) |c, i| {
- const index = @intCast(u32, i);
+ const index = @as(u32, @intCast(i));
switch (r.state) {
.chunk_data_suffix => switch (c) {
'\r' => r.state = .chunk_data_suffix_r,
@@ -529,7 +529,7 @@ pub const HeadersParser = struct {
try conn.fill();
const nread = @min(conn.peek().len, data_avail);
- conn.drop(@intCast(u16, nread));
+ conn.drop(@as(u16, @intCast(nread)));
r.next_chunk_length -= nread;
if (r.next_chunk_length == 0) r.done = true;
@@ -538,7 +538,7 @@ pub const HeadersParser = struct {
} else {
const out_avail = buffer.len;
- const can_read = @intCast(usize, @min(data_avail, out_avail));
+ const can_read = @as(usize, @intCast(@min(data_avail, out_avail)));
const nread = try conn.read(buffer[0..can_read]);
r.next_chunk_length -= nread;
@@ -551,7 +551,7 @@ pub const HeadersParser = struct {
try conn.fill();
const i = r.findChunkedLen(conn.peek());
- conn.drop(@intCast(u16, i));
+ conn.drop(@as(u16, @intCast(i)));
switch (r.state) {
.invalid => return error.HttpChunkInvalid,
@@ -579,10 +579,10 @@ pub const HeadersParser = struct {
try conn.fill();
const nread = @min(conn.peek().len, data_avail);
- conn.drop(@intCast(u16, nread));
+ conn.drop(@as(u16, @intCast(nread)));
r.next_chunk_length -= nread;
} else if (out_avail > 0) {
- const can_read = @intCast(usize, @min(data_avail, out_avail));
+ const can_read: usize = @intCast(@min(data_avail, out_avail));
const nread = try conn.read(buffer[out_index..][0..can_read]);
r.next_chunk_length -= nread;
out_index += nread;
@@ -601,21 +601,21 @@ pub const HeadersParser = struct {
};
inline fn int16(array: *const [2]u8) u16 {
- return @bitCast(u16, array.*);
+ return @as(u16, @bitCast(array.*));
}
inline fn int24(array: *const [3]u8) u24 {
- return @bitCast(u24, array.*);
+ return @as(u24, @bitCast(array.*));
}
inline fn int32(array: *const [4]u8) u32 {
- return @bitCast(u32, array.*);
+ return @as(u32, @bitCast(array.*));
}
inline fn intShift(comptime T: type, x: anytype) T {
switch (@import("builtin").cpu.arch.endian()) {
- .Little => return @truncate(T, x >> (@bitSizeOf(@TypeOf(x)) - @bitSizeOf(T))),
- .Big => return @truncate(T, x),
+ .Little => return @as(T, @truncate(x >> (@bitSizeOf(@TypeOf(x)) - @bitSizeOf(T)))),
+ .Big => return @as(T, @truncate(x)),
}
}
@@ -634,7 +634,7 @@ const MockBufferedConnection = struct {
const nread = try conn.conn.read(conn.buf[0..]);
if (nread == 0) return error.EndOfStream;
conn.start = 0;
- conn.end = @truncate(u16, nread);
+ conn.end = @as(u16, @truncate(nread));
}
pub fn peek(conn: *MockBufferedConnection) []const u8 {
@@ -652,7 +652,7 @@ const MockBufferedConnection = struct {
const left = buffer.len - out_index;
if (available > 0) {
- const can_read = @truncate(u16, @min(available, left));
+ const can_read = @as(u16, @truncate(@min(available, left)));
@memcpy(buffer[out_index..][0..can_read], conn.buf[conn.start..][0..can_read]);
out_index += can_read;
@@ -705,8 +705,8 @@ test "HeadersParser.findHeadersEnd" {
for (0..36) |i| {
r = HeadersParser.initDynamic(0);
- try std.testing.expectEqual(@intCast(u32, i), r.findHeadersEnd(data[0..i]));
- try std.testing.expectEqual(@intCast(u32, 35 - i), r.findHeadersEnd(data[i..]));
+ try std.testing.expectEqual(@as(u32, @intCast(i)), r.findHeadersEnd(data[0..i]));
+ try std.testing.expectEqual(@as(u32, @intCast(35 - i)), r.findHeadersEnd(data[i..]));
}
}
@@ -761,7 +761,7 @@ test "HeadersParser.read length" {
try conn.fill();
const nchecked = try r.checkCompleteHead(std.testing.allocator, conn.peek());
- conn.drop(@intCast(u16, nchecked));
+ conn.drop(@as(u16, @intCast(nchecked)));
if (r.state.isContent()) break;
}
@@ -792,7 +792,7 @@ test "HeadersParser.read chunked" {
try conn.fill();
const nchecked = try r.checkCompleteHead(std.testing.allocator, conn.peek());
- conn.drop(@intCast(u16, nchecked));
+ conn.drop(@as(u16, @intCast(nchecked)));
if (r.state.isContent()) break;
}
@@ -822,7 +822,7 @@ test "HeadersParser.read chunked trailer" {
try conn.fill();
const nchecked = try r.checkCompleteHead(std.testing.allocator, conn.peek());
- conn.drop(@intCast(u16, nchecked));
+ conn.drop(@as(u16, @intCast(nchecked)));
if (r.state.isContent()) break;
}
@@ -837,7 +837,7 @@ test "HeadersParser.read chunked trailer" {
try conn.fill();
const nchecked = try r.checkCompleteHead(std.testing.allocator, conn.peek());
- conn.drop(@intCast(u16, nchecked));
+ conn.drop(@as(u16, @intCast(nchecked)));
if (r.state.isContent()) break;
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-28 05:12:53 +0000