Resolve issues after API changes in v0.15

Author: marselester

build.zig

@@ -10,9 +10,11 @@ pub fn build(b: *std.Build) void {
 
     {
         const tests = b.addTest(.{
-            .target = target,
-            .optimize = optimize,
-            .root_source_file = b.path("src/maxminddb.zig"),
+            .root_module = b.createModule(.{
+                .target = target,
+                .optimize = optimize,
+                .root_source_file = b.path("src/maxminddb.zig"),
+            }),
         });
 
         const run_tests = b.addRunArtifact(tests);
@@ -32,9 +34,11 @@ pub fn build(b: *std.Build) void {
         for (examples) |ex| {
             const exe = b.addExecutable(.{
                 .name = ex.name,
-                .target = target,
-                .optimize = optimize,
-                .root_source_file = b.path(ex.file),
+                .root_module = b.createModule(.{
+                    .target = target,
+                    .optimize = optimize,
+                    .root_source_file = b.path(ex.file),
+                }),
             });
             exe.root_module.addImport("maxminddb", maxminddb_module);
             b.installArtifact(exe);

examples/within.zig

@@ -4,8 +4,6 @@ const maxminddb = @import("maxminddb");
 const db_path = "test-data/test-data/GeoLite2-City-Test.mmdb";
 
 pub fn main() !void {
-    const stdout = std.io.getStdOut().writer();
-
     var gpa = std.heap.GeneralPurposeAllocator(.{}){};
     const allocator = gpa.allocator();
     defer _ = gpa.detectLeaks();
@@ -31,22 +29,22 @@ pub fn main() !void {
         }
 
         if (city.len != 0) {
-            try stdout.print("{}/{d} {s}-{s}-{s}\n", .{
+            std.debug.print("{f}/{d} {s}-{s}-{s}\n", .{
                 item.net.ip,
                 item.net.prefix_len,
                 continent,
                 country,
                 city,
             });
         } else if (country.len != 0) {
-            try stdout.print("{}/{d} {s}-{s}\n", .{
+            std.debug.print("{f}/{d} {s}-{s}\n", .{
                 item.net.ip,
                 item.net.prefix_len,
                 continent,
                 country,
             });
         } else if (continent.len != 0) {
-            try stdout.print("{}/{d} {s}\n", .{
+            std.debug.print("{f}/{d} {s}\n", .{
                 item.net.ip,
                 item.net.prefix_len,
                 continent,
@@ -56,5 +54,5 @@ pub fn main() !void {
         n += 1;
     }
 
-    try stdout.print("processed {d} items\n", .{n});
+    std.debug.print("processed {d} items\n", .{n});
 }

src/decoder.zig

@@ -187,8 +187,8 @@ pub const Decoder = struct {
                         return DecodeError.ExpectedMap;
                     }
 
-                    const Key = std.meta.FieldType(DecodedType.KV, .key);
-                    const Value = std.meta.FieldType(DecodedType.KV, .value);
+                    const Key = std.meta.fieldInfo(DecodedType.KV, .key).type;
+                    const Value = std.meta.fieldInfo(DecodedType.KV, .value).type;
                     var map = DecodedType.init(allocator);
                     const map_len = field.size;
                     try map.ensureTotalCapacity(map_len);

src/reader.zig

@@ -55,7 +55,7 @@ pub const Reader = struct {
         var f = try std.fs.cwd().openFile(path, .{});
         defer f.close();
 
-        const src = try f.reader().readAllAlloc(allocator, max_db_size);
+        const src = try f.readToEndAlloc(allocator, max_db_size);
         errdefer allocator.free(src);
 
         // Decode database metadata which is stored as a separate data section,
@@ -165,7 +165,7 @@ pub const Reader = struct {
         const node_count = self.metadata.node_count;
 
         var stack = try std.ArrayList(WithinNode).initCapacity(allocator, bit_count - prefix_len);
-        errdefer stack.deinit();
+        errdefer stack.deinit(allocator);
 
         // Traverse down the tree to the level that matches the CIDR mark.
         var i: usize = 0;
@@ -401,7 +401,7 @@ fn Iterator(comptime T: type) type {
         }
 
         pub fn deinit(self: *Self) void {
-            self.stack.deinit();
+            self.stack.deinit(self.allocator);
         }
     };
 }