summaryrefslogtreecommitdiff
path: root/src/wire.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/wire.zig')
-rw-r--r--src/wire.zig44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/wire.zig b/src/wire.zig
index e093450..05bc32c 100644
--- a/src/wire.zig
+++ b/src/wire.zig
@@ -45,7 +45,7 @@ pub const Type = enum(u8) {
};
pub fn isT(t: Type) bool {
- return @intFromEnum(t) % 2 == 0;
+ return @backingInt(t) % 2 == 0;
}
pub const header_len: usize = 4 + 1 + 2;
@@ -85,7 +85,7 @@ comptime {
assert(qid_len == 13);
assert(stat_fixed == 49);
for (std.enums.values(Type)) |t| {
- const even = @intFromEnum(t) % 2 == 0;
+ const even = @backingInt(t) % 2 == 0;
assert(isT(t) == even);
assert(std.mem.startsWith(u8, @tagName(t), if (even) "t" else "r"));
}
@@ -320,7 +320,7 @@ pub fn encode(msg: Msg, tag: u16, buf: []u8) Error![]u8 {
var w: Writer = .init(buf[0..total]);
try w.putU32(@intCast(total));
- try w.putByte(@intFromEnum(msg.msgType()));
+ try w.putByte(@backingInt(msg.msgType()));
try w.putU16(tag);
switch (msg) {
@@ -420,7 +420,7 @@ pub fn decode(bytes: []const u8) Error!Decoded {
if (size > bytes.len) return error.Truncated;
if (size < bytes.len) return error.Trailing;
- const t: Type = @enumFromInt(bytes[4]);
+ const t: Type = @fromBackingInt(@intCast(bytes[4]));
const tag = std.mem.readInt(u16, bytes[5..7], .little);
var r: Reader = .init(bytes[header_len..size]);
@@ -724,14 +724,14 @@ const sample_stat: Stat = .{
};
test "9p: the type numbers and their parity are the protocol's own" {
- try testing.expectEqual(@as(u8, 100), @intFromEnum(Type.tversion));
- try testing.expectEqual(@as(u8, 106), @intFromEnum(Type.terror));
- try testing.expectEqual(@as(u8, 107), @intFromEnum(Type.rerror));
- try testing.expectEqual(@as(u8, 126), @intFromEnum(Type.twstat));
- try testing.expectEqual(@as(u8, 127), @intFromEnum(Type.rwstat));
+ try testing.expectEqual(@as(u8, 100), @backingInt(Type.tversion));
+ try testing.expectEqual(@as(u8, 106), @backingInt(Type.terror));
+ try testing.expectEqual(@as(u8, 107), @backingInt(Type.rerror));
+ try testing.expectEqual(@as(u8, 126), @backingInt(Type.twstat));
+ try testing.expectEqual(@as(u8, 127), @backingInt(Type.rwstat));
try testing.expectEqual(@as(usize, 28), std.enums.values(Type).len);
- for (std.enums.values(Type), 100..) |t, want| try testing.expectEqual(@as(u8, @intCast(want)), @intFromEnum(t));
+ for (std.enums.values(Type), 100..) |t, want| try testing.expectEqual(@as(u8, @intCast(want)), @backingInt(t));
try testing.expect(isT(.tversion));
try testing.expect(!isT(.rversion));
@@ -814,8 +814,8 @@ test "9p: every message round-trips" {
_ = try roundTrip(&buf, 13, .{ .twstat = .{ .fid = 1, .stat = sample_stat } });
_ = try roundTrip(&buf, 13, .rwstat);
- try testing.expectEqual(@as(usize, 27), @typeInfo(Msg).@"union".fields.len);
- try testing.expectEqual(std.enums.values(Type).len - 1, @typeInfo(Msg).@"union".fields.len);
+ try testing.expectEqual(@as(usize, 27), @typeInfo(Msg).@"union".field_names.len);
+ try testing.expectEqual(std.enums.values(Type).len - 1, @typeInfo(Msg).@"union".field_names.len);
}
test "9p: empty and maximum-length strings survive the trip" {
@@ -862,7 +862,7 @@ test "9p: Twalk carries 0, 1 and 16 elements and refuses 17" {
const bad = blk: {
var w: Writer = .init(&raw);
try w.putU32(0); // patched below
- try w.putByte(@intFromEnum(Type.twalk));
+ try w.putByte(@backingInt(Type.twalk));
try w.putU16(1);
try w.putU32(0);
try w.putU32(1);
@@ -877,7 +877,7 @@ test "9p: Twalk carries 0, 1 and 16 elements and refuses 17" {
const bad_r = blk: {
var w: Writer = .init(&raw);
try w.putU32(0);
- try w.putByte(@intFromEnum(Type.rwalk));
+ try w.putByte(@backingInt(Type.rwalk));
try w.putU16(1);
try w.putU16(17);
for (0..17) |_| try w.putQid(sample_qid);
@@ -1003,13 +1003,13 @@ test "9p: an unknown or illegal type byte is refused" {
var t: u16 = 0;
while (t <= 255) : (t += 1) {
raw[4] = @intCast(t);
- const defined = t >= 100 and t <= 127 and t != @intFromEnum(Type.terror);
+ const defined = t >= 100 and t <= 127 and t != @backingInt(Type.terror);
if (decode(raw[0..bytes.len])) |got| {
- try testing.expectEqual(@as(u8, @intCast(t)), @intFromEnum(got.msg.msgType()));
- try testing.expect(t == @intFromEnum(Type.tclunk) or
- t == @intFromEnum(Type.tremove) or
- t == @intFromEnum(Type.tstat) or
- t == @intFromEnum(Type.rwrite));
+ try testing.expectEqual(@as(u8, @intCast(t)), @backingInt(got.msg.msgType()));
+ try testing.expect(t == @backingInt(Type.tclunk) or
+ t == @backingInt(Type.tremove) or
+ t == @backingInt(Type.tstat) or
+ t == @backingInt(Type.rwrite));
} else |err| {
if (!defined) try testing.expectEqual(Error.BadTag, err);
}
@@ -1021,7 +1021,7 @@ test "9p: trailing bytes inside the size are refused" {
var w: Writer = .init(&raw);
try w.putU32(12);
- try w.putByte(@intFromEnum(Type.tclunk));
+ try w.putByte(@backingInt(Type.tclunk));
try w.putU16(1);
try w.putU32(7);
try w.putByte(0xAA);
@@ -1030,7 +1030,7 @@ test "9p: trailing bytes inside the size are refused" {
w = .init(&raw);
try w.putU32(header_len + 2 + 2);
- try w.putByte(@intFromEnum(Type.tflush));
+ try w.putByte(@backingInt(Type.tflush));
try w.putU16(1);
try w.putU16(3);
try w.putU16(3);