Skip to content

Commit 8fe9f86

Browse files
loxlox
committed
chore: port to Zig 0.15.1
Update build system and ArrayList API for Zig 0.15.1 compatibility: - Use createModule() with root_module in addTest() - Change ArrayList initialization from .init(allocator) to {} - Pass allocator to .deinit() and .writer() methods All tests passing (131/131)
1 parent 45146d9 commit 8fe9f86

4 files changed

Lines changed: 44 additions & 42 deletions

File tree

‎build.zig‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ pub fn build(b: *std.Build) !void {
99
});
1010

1111
const tests = b.addTest(.{
12-
.root_source_file = b.path("src/msgpack.zig"),
13-
.target = target,
14-
.optimize = optimize,
12+
.root_module = b.createModule(.{
13+
.root_source_file = b.path("src/msgpack.zig"),
14+
.target = target,
15+
.optimize = optimize,
16+
}),
1517
});
1618

1719
const run_test = b.addRunArtifact(tests);

‎src/enum.zig‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ test "pack/unpack enum" {
9292

9393
// Test plain enum
9494
{
95-
var buffer = std.ArrayList(u8).init(std.testing.allocator);
96-
defer buffer.deinit();
95+
var buffer = std.ArrayList(u8){};
96+
defer buffer.deinit(std.testing.allocator);
9797

98-
try packEnum(buffer.writer(), PlainEnum, .bar);
98+
try packEnum(buffer.writer(std.testing.allocator), PlainEnum, .bar);
9999

100100
var stream = std.io.fixedBufferStream(buffer.items);
101101
const result = try unpackEnum(stream.reader(), PlainEnum);
@@ -104,10 +104,10 @@ test "pack/unpack enum" {
104104

105105
// Test enum(u8)
106106
{
107-
var buffer = std.ArrayList(u8).init(std.testing.allocator);
108-
defer buffer.deinit();
107+
var buffer = std.ArrayList(u8){};
108+
defer buffer.deinit(std.testing.allocator);
109109

110-
try packEnum(buffer.writer(), U8Enum, .bar);
110+
try packEnum(buffer.writer(std.testing.allocator), U8Enum, .bar);
111111

112112
var stream = std.io.fixedBufferStream(buffer.items);
113113
const result = try unpackEnum(stream.reader(), U8Enum);
@@ -116,10 +116,10 @@ test "pack/unpack enum" {
116116

117117
// Test enum(u16)
118118
{
119-
var buffer = std.ArrayList(u8).init(std.testing.allocator);
120-
defer buffer.deinit();
119+
var buffer = std.ArrayList(u8){};
120+
defer buffer.deinit(std.testing.allocator);
121121

122-
try packEnum(buffer.writer(), U16Enum, .alpha);
122+
try packEnum(buffer.writer(std.testing.allocator), U16Enum, .alpha);
123123

124124
var stream = std.io.fixedBufferStream(buffer.items);
125125
const result = try unpackEnum(stream.reader(), U16Enum);
@@ -137,10 +137,10 @@ test "enum edge cases" {
137137
fourth, // auto-assigned to 21
138138
};
139139

140-
var buffer = std.ArrayList(u8).init(std.testing.allocator);
141-
defer buffer.deinit();
140+
var buffer = std.ArrayList(u8){};
141+
defer buffer.deinit(std.testing.allocator);
142142

143-
try packEnum(buffer.writer(), MixedEnum, .second);
143+
try packEnum(buffer.writer(std.testing.allocator), MixedEnum, .second);
144144

145145
var stream = std.io.fixedBufferStream(buffer.items);
146146
const result = try unpackEnum(stream.reader(), MixedEnum);
@@ -154,11 +154,11 @@ test "optional enum" {
154154

155155
// Test non-null optional enum
156156
{
157-
var buffer = std.ArrayList(u8).init(std.testing.allocator);
158-
defer buffer.deinit();
157+
var buffer = std.ArrayList(u8){};
158+
defer buffer.deinit(std.testing.allocator);
159159

160160
const value: OptionalEnum = .bar;
161-
try packEnum(buffer.writer(), OptionalEnum, value);
161+
try packEnum(buffer.writer(std.testing.allocator), OptionalEnum, value);
162162

163163
var stream = std.io.fixedBufferStream(buffer.items);
164164
const result = try unpackEnum(stream.reader(), OptionalEnum);
@@ -167,11 +167,11 @@ test "optional enum" {
167167

168168
// Test null optional enum
169169
{
170-
var buffer = std.ArrayList(u8).init(std.testing.allocator);
171-
defer buffer.deinit();
170+
var buffer = std.ArrayList(u8){};
171+
defer buffer.deinit(std.testing.allocator);
172172

173173
const value: OptionalEnum = null;
174-
try packEnum(buffer.writer(), OptionalEnum, value);
174+
try packEnum(buffer.writer(std.testing.allocator), OptionalEnum, value);
175175

176176
var stream = std.io.fixedBufferStream(buffer.items);
177177
const result = try unpackEnum(stream.reader(), OptionalEnum);

‎src/map.zig‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,10 @@ test "packMap managed" {
111111

112112
try map.put(1, 2);
113113

114-
var buf = std.ArrayList(u8).init(std.testing.allocator);
115-
defer buf.deinit();
114+
var buf = std.ArrayList(u8){};
115+
defer buf.deinit(std.testing.allocator);
116116

117-
try packMap(buf.writer(), map);
117+
try packMap(buf.writer(std.testing.allocator), map);
118118

119119
try std.testing.expectEqualSlices(u8, &[_]u8{ 0x81, 0x01, 0x02 }, buf.items);
120120
}
@@ -125,10 +125,10 @@ test "packMap unmanaged" {
125125

126126
try map.put(1, 2);
127127

128-
var buf = std.ArrayList(u8).init(std.testing.allocator);
129-
defer buf.deinit();
128+
var buf = std.ArrayList(u8){};
129+
defer buf.deinit(std.testing.allocator);
130130

131-
try packMap(buf.writer(), map.unmanaged);
131+
try packMap(buf.writer(std.testing.allocator), map.unmanaged);
132132

133133
try std.testing.expectEqualSlices(u8, &[_]u8{ 0x81, 0x01, 0x02 }, buf.items);
134134
}

‎src/msgpack.zig‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -303,13 +303,13 @@ test "encode/decode" {
303303
age: u8,
304304
};
305305

306-
var buffer = std.ArrayList(u8).init(std.testing.allocator);
307-
defer buffer.deinit();
306+
var buffer = std.ArrayList(u8){};
307+
defer buffer.deinit(std.testing.allocator);
308308

309309
try encode(Message{
310310
.name = "John",
311311
.age = 20,
312-
}, buffer.writer());
312+
}, buffer.writer(std.testing.allocator));
313313

314314
const decoded = try decodeFromSlice(Message, std.testing.allocator, buffer.items);
315315
defer decoded.deinit();
@@ -324,10 +324,10 @@ test "encode/decode enum" {
324324

325325
// Test enum(u8)
326326
{
327-
var buffer = std.ArrayList(u8).init(std.testing.allocator);
328-
defer buffer.deinit();
327+
var buffer = std.ArrayList(u8){};
328+
defer buffer.deinit(std.testing.allocator);
329329

330-
try encode(Status.active, buffer.writer());
330+
try encode(Status.active, buffer.writer(std.testing.allocator));
331331

332332
const decoded = try decodeFromSlice(Status, std.testing.allocator, buffer.items);
333333
defer decoded.deinit();
@@ -337,10 +337,10 @@ test "encode/decode enum" {
337337

338338
// Test plain enum
339339
{
340-
var buffer = std.ArrayList(u8).init(std.testing.allocator);
341-
defer buffer.deinit();
340+
var buffer = std.ArrayList(u8){};
341+
defer buffer.deinit(std.testing.allocator);
342342

343-
try encode(PlainEnum.bar, buffer.writer());
343+
try encode(PlainEnum.bar, buffer.writer(std.testing.allocator));
344344

345345
const decoded = try decodeFromSlice(PlainEnum, std.testing.allocator, buffer.items);
346346
defer decoded.deinit();
@@ -350,10 +350,10 @@ test "encode/decode enum" {
350350

351351
// Test optional enum with null
352352
{
353-
var buffer = std.ArrayList(u8).init(std.testing.allocator);
354-
defer buffer.deinit();
353+
var buffer = std.ArrayList(u8){};
354+
defer buffer.deinit(std.testing.allocator);
355355

356-
try encode(@as(?Status, null), buffer.writer());
356+
try encode(@as(?Status, null), buffer.writer(std.testing.allocator));
357357

358358
const decoded = try decodeFromSlice(?Status, std.testing.allocator, buffer.items);
359359
defer decoded.deinit();
@@ -363,10 +363,10 @@ test "encode/decode enum" {
363363

364364
// Test optional enum with value
365365
{
366-
var buffer = std.ArrayList(u8).init(std.testing.allocator);
367-
defer buffer.deinit();
366+
var buffer = std.ArrayList(u8){};
367+
defer buffer.deinit(std.testing.allocator);
368368

369-
try encode(@as(?Status, .pending), buffer.writer());
369+
try encode(@as(?Status, .pending), buffer.writer(std.testing.allocator));
370370

371371
const decoded = try decodeFromSlice(?Status, std.testing.allocator, buffer.items);
372372
defer decoded.deinit();

0 commit comments

Comments
 (0)