|
1 | 1 | const std = @import("std");
|
| 2 | +const builtin = @import("builtin"); |
2 | 3 | const msgpack = @import("msgpack");
|
3 | 4 | const allocator = std.testing.allocator;
|
4 | 5 | const expect = std.testing.expect;
|
@@ -825,18 +826,21 @@ test "large maps" {
|
825 | 826 | defer large_map.free(allocator);
|
826 | 827 |
|
827 | 828 | // Store allocated keys to free them later
|
828 |
| - var keys = std.ArrayList([]u8).init(allocator); |
| 829 | + var keys = if (builtin.zig_version.minor == 14) |
| 830 | + std.ArrayList([]u8).init(allocator) |
| 831 | + else |
| 832 | + std.ArrayList([]u8){}; |
829 | 833 | defer {
|
830 | 834 | for (keys.items) |key| {
|
831 | 835 | allocator.free(key);
|
832 | 836 | }
|
833 |
| - keys.deinit(); |
| 837 | + if (builtin.zig_version.minor == 14) keys.deinit() else keys.deinit(allocator); |
834 | 838 | }
|
835 | 839 |
|
836 | 840 | // Create a map with 20 entries (more than fixmap limit of 15)
|
837 | 841 | for (0..20) |i| {
|
838 | 842 | const key = try std.fmt.allocPrint(allocator, "key{d}", .{i});
|
839 |
| - try keys.append(key); |
| 843 | + if (builtin.zig_version.minor == 14) try keys.append(key) else try keys.append(allocator, key); |
840 | 844 | try large_map.mapPut(key, Payload.intToPayload(@intCast(i)));
|
841 | 845 | }
|
842 | 846 |
|
@@ -1174,18 +1178,21 @@ test "actual map32 format" {
|
1174 | 1178 | defer large_map.free(allocator);
|
1175 | 1179 |
|
1176 | 1180 | // Store allocated keys to free them later
|
1177 |
| - var keys = std.ArrayList([]u8).init(allocator); |
| 1181 | + var keys = if (builtin.zig_version.minor == 14) |
| 1182 | + std.ArrayList([]u8).init(allocator) |
| 1183 | + else |
| 1184 | + std.ArrayList([]u8){}; |
1178 | 1185 | defer {
|
1179 | 1186 | for (keys.items) |key| {
|
1180 | 1187 | allocator.free(key);
|
1181 | 1188 | }
|
1182 |
| - keys.deinit(); |
| 1189 | + if (builtin.zig_version.minor == 14) keys.deinit() else keys.deinit(allocator); |
1183 | 1190 | }
|
1184 | 1191 |
|
1185 | 1192 | // Create a map with 1000 entries (more than map16 threshold of 65535 would be too memory intensive)
|
1186 | 1193 | for (0..1000) |i| {
|
1187 | 1194 | const key = try std.fmt.allocPrint(allocator, "key{d:0>10}", .{i});
|
1188 |
| - try keys.append(key); |
| 1195 | + if (builtin.zig_version.minor == 14) try keys.append(key) else try keys.append(allocator, key); |
1189 | 1196 | try large_map.mapPut(key, Payload.intToPayload(@intCast(i)));
|
1190 | 1197 | }
|
1191 | 1198 |
|
@@ -1335,17 +1342,20 @@ test "format markers verification" {
|
1335 | 1342 | var test_map = Payload.mapPayload(allocator);
|
1336 | 1343 | defer test_map.free(allocator);
|
1337 | 1344 |
|
1338 |
| - var test_keys = std.ArrayList([]u8).init(allocator); |
| 1345 | + var test_keys = if (builtin.zig_version.minor == 14) |
| 1346 | + std.ArrayList([]u8).init(allocator) |
| 1347 | + else |
| 1348 | + std.ArrayList([]u8){}; |
1339 | 1349 | defer {
|
1340 | 1350 | for (test_keys.items) |key| {
|
1341 | 1351 | allocator.free(key);
|
1342 | 1352 | }
|
1343 |
| - test_keys.deinit(); |
| 1353 | + if (builtin.zig_version.minor == 14) test_keys.deinit() else test_keys.deinit(allocator); |
1344 | 1354 | }
|
1345 | 1355 |
|
1346 | 1356 | for (0..16) |i| {
|
1347 | 1357 | const key = try std.fmt.allocPrint(allocator, "k{d}", .{i});
|
1348 |
| - try test_keys.append(key); |
| 1358 | + if (builtin.zig_version.minor == 14) try test_keys.append(key) else try test_keys.append(allocator, key); |
1349 | 1359 | try test_map.mapPut(key, Payload.nilToPayload());
|
1350 | 1360 | }
|
1351 | 1361 | try p.write(test_map);
|
|
0 commit comments