From 29fb00a1c3a60d4faca2fb29ae56b73362baa917 Mon Sep 17 00:00:00 2001
From: Rutger Broekhoff
Date: Mon, 20 Sep 2021 11:57:39 +0200
Subject: Make compatible with Zig master

---
 build.zig    | 11 +++++++----
 gyro.zzz     |  2 +-
 src/main.zig |  8 ++++----
 tool/znk.zig | 10 +++++-----
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/build.zig b/build.zig
index 6758252..412408b 100644
--- a/build.zig
+++ b/build.zig
@@ -4,7 +4,7 @@ pub fn build(b: *std.build.Builder) !void {
     const mode = b.standardReleaseOptions();
     const target = b.standardTargetOptions(.{});
 
-    var lib_tests = b.addTest("src/main.zig");
+    const lib_tests = b.addTest("src/main.zig");
     lib_tests.setBuildMode(mode);
 
     const test_step = b.step("test", "Run library tests");
@@ -12,10 +12,13 @@ pub fn build(b: *std.build.Builder) !void {
 
     const znk_version = "0.2.1";
 
-    var znk_tests = b.addTest("tool/znk.zig");
+    const znk_options = b.addOptions();
+    znk_options.addOption([]const u8, "version", znk_version);
+
+    const znk_tests = b.addTest("tool/znk.zig");
     znk_tests.setBuildMode(mode);
     znk_tests.addPackagePath("nkeys", "src/main.zig");
-    znk_tests.addBuildOption([]const u8, "version", znk_version);
+    znk_tests.addOptions("build_options", znk_options);
 
     const znk_test_step = b.step("test-znk", "Run znk tests");
     znk_test_step.dependOn(&znk_tests.step);
@@ -24,7 +27,7 @@ pub fn build(b: *std.build.Builder) !void {
     znk.setBuildMode(mode);
     znk.setTarget(target);
     znk.addPackagePath("nkeys", "src/main.zig");
-    znk.addBuildOption([]const u8, "version", znk_version);
+    znk.addOptions("build_options", znk_options);
 
     const znk_install = b.addInstallArtifact(znk);
 
diff --git a/gyro.zzz b/gyro.zzz
index d1533d3..da457a6 100644
--- a/gyro.zzz
+++ b/gyro.zzz
@@ -1,6 +1,6 @@
 pkgs:
   nkeys:
-    version: 0.3.0
+    version: 0.3.1
     description: "NKeys support for Zig"
     license: Apache-2.0
     source_url: "https://github.com/rutgerbrf/zig-nkeys"
diff --git a/src/main.zig b/src/main.zig
index a299afe..3206f45 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -390,7 +390,7 @@ pub fn areKeySectionContentsValid(contents: []const u8) bool {
     return true;
 }
 
-pub fn findKeySection(line_it: *std.mem.SplitIterator) ?[]const u8 {
+pub fn findKeySection(line_it: *std.mem.SplitIterator(u8)) ?[]const u8 {
     while (true) {
         const opening_line = line_it.next() orelse return null;
         if (!isKeySectionBarrier(opening_line, true)) continue;
@@ -406,12 +406,12 @@ pub fn findKeySection(line_it: *std.mem.SplitIterator) ?[]const u8 {
 }
 
 pub fn parseDecoratedJwt(contents: []const u8) []const u8 {
-    var line_it = mem.split(contents, "\n");
+    var line_it = mem.split(u8, contents, "\n");
     return findKeySection(&line_it) orelse return contents;
 }
 
 pub fn parseDecoratedNkey(contents: []const u8) NoNkeySeedFoundError!SeedKeyPair {
-    var line_it = mem.split(contents, "\n");
+    var line_it = mem.split(u8, contents, "\n");
     var seed: ?[]const u8 = null;
     if (findKeySection(&line_it) != null)
         seed = findKeySection(&line_it);
@@ -439,7 +439,7 @@ fn isValidCredsNkey(text: []const u8) bool {
 }
 
 fn findNkey(text: []const u8) ?[]const u8 {
-    var line_it = std.mem.split(text, "\n");
+    var line_it = std.mem.split(u8, text, "\n");
     while (line_it.next()) |line| {
         for (line) |c, i| {
             if (!ascii.isSpace(c)) {
diff --git a/tool/znk.zig b/tool/znk.zig
index 0a4b764..ff5540e 100644
--- a/tool/znk.zig
+++ b/tool/znk.zig
@@ -443,11 +443,11 @@ fn PrefixKeyGenerator(comptime EntropyReaderType: type) type {
             }
         } else struct {
             pub fn generate(self: *Self) !void {
-                var cpu_count = try std.Thread.cpuCount();
-                var threads = try self.allocator.alloc(*std.Thread, cpu_count);
+                var cpu_count = try std.Thread.getCpuCount();
+                var threads = try self.allocator.alloc(std.Thread, cpu_count);
                 defer self.allocator.free(threads);
-                for (threads) |*thread| thread.* = try std.Thread.spawn(Self.generatePrivate, self);
-                for (threads) |thread| thread.wait();
+                for (threads) |*thread| thread.* = try std.Thread.spawn(.{}, Self.generatePrivate, .{ self });
+                for (threads) |thread| thread.join();
             }
         };
     };
@@ -526,7 +526,7 @@ pub fn readKeyFile(allocator: *Allocator, file: fs.File) ?Nkey {
         allocator.free(bytes);
     }
 
-    var iterator = mem.split(bytes, "\n");
+    var iterator = mem.split(u8, bytes, "\n");
     while (iterator.next()) |line| {
         if (nkeys.isValidEncoding(line) and line.len == nkeys.text_seed_len) {
             var k = Nkey.fromText(line) catch continue;
-- 
cgit v1.2.3