mirrors/zits
1
0
Fork 0
mirror of https://git.robbyzambito.me/zits synced 2026-02-04 11:44:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename assert to expect

Browse Source 
Assert implies panic, expect implies error
This commit is contained in:
Robby Zambito
2025-12-31 00:55:08 +00:00
parent 1b6447a986
commit 1cbd030037
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/server/message_parser.zig
View File

@@ -190,7 +190,7 @@ pub const Message = union(MessageType) {
// Should read the next JSON object to the fixed buffer writer. // Should read the next JSON object to the fixed buffer writer.
_ = try in.streamDelimiter(&connect_string_writer, '}'); _ = try in.streamDelimiter(&connect_string_writer, '}');
try connect_string_writer.writeByte('}'); try connect_string_writer.writeByte('}');
try assertStreamBytes(in, "}\r\n"); // discard '}\r\n' try expectStreamBytes(in, "}\r\n"); // discard '}\r\n'
// TODO: should be CONNECTION allocator // TODO: should be CONNECTION allocator
const res = try std.json.parseFromSliceLeaky(Connect, connect_allocator, connect_string_writer.buffered(), .{ .allocate = .alloc_always }); const res = try std.json.parseFromSliceLeaky(Connect, connect_allocator, connect_string_writer.buffered(), .{ .allocate = .alloc_always });
@@ -208,7 +208,7 @@ pub const Message = union(MessageType) {
var byte_count_list: std.ArrayList(u8) = try .initCapacity(alloc, 64); var byte_count_list: std.ArrayList(u8) = try .initCapacity(alloc, 64);
while (in.peekByte()) |byte| { while (in.peekByte()) |byte| {
if (std.ascii.isWhitespace(byte)) { if (std.ascii.isWhitespace(byte)) {
try assertStreamBytes(in, "\r\n"); try expectStreamBytes(in, "\r\n");
break; break;
} }
defer in.toss(1); defer in.toss(1);
@@ -226,7 +226,7 @@ pub const Message = union(MessageType) {
const payload = blk: { const payload = blk: {
const bytes = try alloc.alloc(u8, byte_count); const bytes = try alloc.alloc(u8, byte_count);
try in.readSliceAll(bytes); try in.readSliceAll(bytes);
try assertStreamBytes(in, "\r\n"); try expectStreamBytes(in, "\r\n");
break :blk bytes; break :blk bytes;
}; };
@@ -238,11 +238,11 @@ pub const Message = union(MessageType) {
}; };
}, },
.ping => { .ping => {
try assertStreamBytes(in, "\r\n"); try expectStreamBytes(in, "\r\n");
return .ping; return .ping;
}, },
.pong => { .pong => {
try assertStreamBytes(in, "\r\n"); try expectStreamBytes(in, "\r\n");
return .pong; return .pong;
}, },
.sub => { .sub => {
@@ -270,7 +270,7 @@ pub const Message = union(MessageType) {
}; };
const queue_group = if ((try in.peekByte()) != '\r') second else null; const queue_group = if ((try in.peekByte()) != '\r') second else null;
const sid = if (queue_group) |_| try in.takeDelimiterExclusive('\r') else second; const sid = if (queue_group) |_| try in.takeDelimiterExclusive('\r') else second;
try assertStreamBytes(in, "\r\n"); try expectStreamBytes(in, "\r\n");
return .{ return .{
.sub = .{ .sub = .{
.subject = subject, .subject = subject,
@@ -296,7 +296,7 @@ pub const Message = union(MessageType) {
}; };
if ((try in.peekByte()) == '\r') { if ((try in.peekByte()) == '\r') {
try assertStreamBytes(in, "\r\n"); try expectStreamBytes(in, "\r\n");
return .{ return .{
.unsub = .{ .unsub = .{
.sid = sid, .sid = sid,
@@ -308,7 +308,7 @@ pub const Message = union(MessageType) {
var max_msgs_list: std.ArrayList(u8) = try .initCapacity(alloc, 64); var max_msgs_list: std.ArrayList(u8) = try .initCapacity(alloc, 64);
while (in.peekByte()) |byte| { while (in.peekByte()) |byte| {
if (std.ascii.isWhitespace(byte)) { if (std.ascii.isWhitespace(byte)) {
try assertStreamBytes(in, "\r\n"); try expectStreamBytes(in, "\r\n");
break; break;
} }
@@ -390,7 +390,7 @@ fn parsePub(in: *std.Io.Reader) !Message.Pub {
}; };
} }
inline fn assertStreamBytes(reader: *std.Io.Reader, expected: []const u8) !void { inline fn expectStreamBytes(reader: *std.Io.Reader, expected: []const u8) !void {
if (!std.mem.eql(u8, try reader.take(expected.len), expected)) { if (!std.mem.eql(u8, try reader.take(expected.len), expected)) {
@branchHint(.unlikely); @branchHint(.unlikely);
return error.InvalidStream; return error.InvalidStream;