From b305389dc741dfe3fb5300d4383ade4cddb2ba3e Mon Sep 17 00:00:00 2001
From: Ryan Liptak
Date: Thu, 27 Jun 2024 01:56:54 -0700
Subject: bench: Fix for Windows and use fmtDuration

---
 bench/src/zg_case.zig            | 12 ++++++------
 bench/src/zg_caseless.zig        | 12 ++++++------
 bench/src/zg_codepoint.zig       | 10 +++++-----
 bench/src/zg_grapheme.zig        | 10 +++++-----
 bench/src/zg_normalize.zig       | 18 +++++++++---------
 bench/src/zg_width.zig           | 10 +++++-----
 bench/src/ziglyph_case.zig       | 12 ++++++------
 bench/src/ziglyph_caseless.zig   | 10 +++++-----
 bench/src/ziglyph_codepoint.zig  | 10 +++++-----
 bench/src/ziglyph_grapheme.zig   | 10 +++++-----
 bench/src/ziglyph_normalizer.zig | 18 +++++++++---------
 bench/src/ziglyph_width.zig      | 10 +++++-----
 12 files changed, 71 insertions(+), 71 deletions(-)

(limited to 'bench/src')

diff --git a/bench/src/zg_case.zig b/bench/src/zg_case.zig
index e602c00..2c9cdc0 100644
--- a/bench/src/zg_case.zig
+++ b/bench/src/zg_case.zig
@@ -3,14 +3,14 @@ const std = @import("std");
 const CaseData = @import("CaseData");
 
 pub fn main() !void {
-    var args_iter = std.process.args();
-    _ = args_iter.skip();
-    const in_path = args_iter.next() orelse return error.MissingArg;
-
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena.deinit();
     const allocator = arena.allocator();
 
+    var args_iter = try std.process.argsWithAllocator(allocator);
+    _ = args_iter.skip();
+    const in_path = args_iter.next() orelse return error.MissingArg;
+
     const input = try std.fs.cwd().readFileAlloc(
         allocator,
         in_path,
@@ -29,7 +29,7 @@ pub fn main() !void {
         const lower = try case_data.toLowerStr(allocator, line);
         result += upper.len + lower.len;
     }
-    std.debug.print("zg toUpperStr/toLowerStr: result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });
+    std.debug.print("zg toUpperStr/toLowerStr: result: {}, took: {}\n", .{ result, std.fmt.fmtDuration(timer.lap() / std.time.ns_per_ms) });
 
     result = 0;
     iter.reset();
@@ -39,5 +39,5 @@ pub fn main() !void {
         if (case_data.isUpperStr(line)) result += 1;
         if (case_data.isLowerStr(line)) result += 2;
     }
-    std.debug.print("zg isUpperStr/isLowerStr: result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });
+    std.debug.print("zg isUpperStr/isLowerStr: result: {}, took: {}\n", .{ result, std.fmt.fmtDuration(timer.lap() / std.time.ns_per_ms) });
 }
diff --git a/bench/src/zg_caseless.zig b/bench/src/zg_caseless.zig
index fd0266d..9320a45 100644
--- a/bench/src/zg_caseless.zig
+++ b/bench/src/zg_caseless.zig
@@ -4,14 +4,14 @@ const CaseFold = @import("CaseFold");
 const Normalize = @import("Normalize");
 
 pub fn main() !void {
-    var args_iter = std.process.args();
-    _ = args_iter.skip();
-    const in_path = args_iter.next() orelse return error.MissingArg;
-
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena.deinit();
     const allocator = arena.allocator();
 
+    var args_iter = try std.process.argsWithAllocator(allocator);
+    _ = args_iter.skip();
+    const in_path = args_iter.next() orelse return error.MissingArg;
+
     const input = try std.fs.cwd().readFileAlloc(
         allocator,
         in_path,
@@ -41,7 +41,7 @@ pub fn main() !void {
         @memcpy(buf[0..line.len], line);
         prev_line = buf[0..line.len];
     }
-    std.debug.print("zg CaseFold.compatCaselessMatch: result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });
+    std.debug.print("zg CaseFold.compatCaselessMatch: result: {}, took: {}\n", .{ result, std.fmt.fmtDuration(timer.lap() / std.time.ns_per_ms) });
 
     result = 0;
     iter.reset();
@@ -57,5 +57,5 @@ pub fn main() !void {
         @memcpy(buf[0..line.len], line);
         prev_line = buf[0..line.len];
     }
-    std.debug.print("zg CaseFold.canonCaselessMatch: result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });
+    std.debug.print("zg CaseFold.canonCaselessMatch: result: {}, took: {}\n", .{ result, std.fmt.fmtDuration(timer.lap() / std.time.ns_per_ms) });
 }
diff --git a/bench/src/zg_codepoint.zig b/bench/src/zg_codepoint.zig
index 0564fa1..af83199 100644
--- a/bench/src/zg_codepoint.zig
+++ b/bench/src/zg_codepoint.zig
@@ -3,14 +3,14 @@ const std = @import("std");
 const CodePointIterator = @import("code_point").Iterator;
 
 pub fn main() !void {
-    var args_iter = std.process.args();
-    _ = args_iter.skip();
-    const in_path = args_iter.next() orelse return error.MissingArg;
-
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena.deinit();
     const allocator = arena.allocator();
 
+    var args_iter = try std.process.argsWithAllocator(allocator);
+    _ = args_iter.skip();
+    const in_path = args_iter.next() orelse return error.MissingArg;
+
     const input = try std.fs.cwd().readFileAlloc(
         allocator,
         in_path,
@@ -23,5 +23,5 @@ pub fn main() !void {
     var timer = try std.time.Timer.start();
 
     while (iter.next()) |_| result += 1;
-    std.debug.print("zg CodePointIterator: result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });
+    std.debug.print("zg CodePointIterator: result: {}, took: {}\n", .{ result, std.fmt.fmtDuration(timer.lap() / std.time.ns_per_ms) });
 }
diff --git a/bench/src/zg_grapheme.zig b/bench/src/zg_grapheme.zig
index 106b970..d004da1 100644
--- a/bench/src/zg_grapheme.zig
+++ b/bench/src/zg_grapheme.zig
@@ -4,14 +4,14 @@ const GraphemeData = @import("grapheme").GraphemeData;
 const GraphemeIterator = @import("grapheme").Iterator;
 
 pub fn main() !void {
-    var args_iter = std.process.args();
-    _ = args_iter.skip();
-    const in_path = args_iter.next() orelse return error.MissingArg;
-
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena.deinit();
     const allocator = arena.allocator();
 
+    var args_iter = try std.process.argsWithAllocator(allocator);
+    _ = args_iter.skip();
+    const in_path = args_iter.next() orelse return error.MissingArg;
+
     const input = try std.fs.cwd().readFileAlloc(
         allocator,
         in_path,
@@ -25,5 +25,5 @@ pub fn main() !void {
     var timer = try std.time.Timer.start();
 
     while (iter.next()) |_| result += 1;
-    std.debug.print("zg GraphemeIterator: result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });
+    std.debug.print("zg GraphemeIterator: result: {}, took: {}\n", .{ result, std.fmt.fmtDuration(timer.lap() / std.time.ns_per_ms) });
 }
diff --git a/bench/src/zg_normalize.zig b/bench/src/zg_normalize.zig
index 87d07da..fb0d4ee 100644
--- a/bench/src/zg_normalize.zig
+++ b/bench/src/zg_normalize.zig
@@ -3,14 +3,14 @@ const std = @import("std");
 const Normalize = @import("Normalize");
 
 pub fn main() !void {
-    var args_iter = std.process.args();
-    _ = args_iter.skip();
-    const in_path = args_iter.next() orelse return error.MissingArg;
-
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena.deinit();
     const allocator = arena.allocator();
 
+    var args_iter = try std.process.argsWithAllocator(allocator);
+    _ = args_iter.skip();
+    const in_path = args_iter.next() orelse return error.MissingArg;
+
     const input = try std.fs.cwd().readFileAlloc(
         allocator,
         in_path,
@@ -30,7 +30,7 @@ pub fn main() !void {
         const nfkc = try normalize.nfkc(allocator, line);
         result += nfkc.slice.len;
     }
-    std.debug.print("zg Normalize.nfkc: result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });
+    std.debug.print("zg Normalize.nfkc: result: {}, took: {}\n", .{ result, std.fmt.fmtDuration(timer.lap() / std.time.ns_per_ms) });
 
     result = 0;
     iter.reset();
@@ -40,7 +40,7 @@ pub fn main() !void {
         const nfc = try normalize.nfc(allocator, line);
         result += nfc.slice.len;
     }
-    std.debug.print("zg Normalize.nfc: result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });
+    std.debug.print("zg Normalize.nfc: result: {}, took: {}\n", .{ result, std.fmt.fmtDuration(timer.lap() / std.time.ns_per_ms) });
 
     result = 0;
     iter.reset();
@@ -50,7 +50,7 @@ pub fn main() !void {
         const nfkd = try normalize.nfkd(allocator, line);
         result += nfkd.slice.len;
     }
-    std.debug.print("zg Normalize.nfkd: result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });
+    std.debug.print("zg Normalize.nfkd: result: {}, took: {}\n", .{ result, std.fmt.fmtDuration(timer.lap() / std.time.ns_per_ms) });
 
     result = 0;
     iter.reset();
@@ -60,7 +60,7 @@ pub fn main() !void {
         const nfd = try normalize.nfd(allocator, line);
         result += nfd.slice.len;
     }
-    std.debug.print("zg Normalize.nfd: result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });
+    std.debug.print("zg Normalize.nfd: result: {}, took: {}\n", .{ result, std.fmt.fmtDuration(timer.lap() / std.time.ns_per_ms) });
 
     result = 0;
     iter.reset();
@@ -73,5 +73,5 @@ pub fn main() !void {
         @memcpy(buf[0..line.len], line);
         prev_line = buf[0..line.len];
     }
-    std.debug.print("Zg Normalize.eql: result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });
+    std.debug.print("Zg Normalize.eql: result: {}, took: {}\n", .{ result, std.fmt.fmtDuration(timer.lap() / std.time.ns_per_ms) });
 }
diff --git a/bench/src/zg_width.zig b/bench/src/zg_width.zig
index c0ce57c..5ee8fe9 100644
--- a/bench/src/zg_width.zig
+++ b/bench/src/zg_width.zig
@@ -3,14 +3,14 @@ const std = @import("std");
 const DisplayWidth = @import("DisplayWidth");
 
 pub fn main() !void {
-    var args_iter = std.process.args();
-    _ = args_iter.skip();
-    const in_path = args_iter.next() orelse return error.MissingArg;
-
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena.deinit();
     const allocator = arena.allocator();
 
+    var args_iter = try std.process.argsWithAllocator(allocator);
+    _ = args_iter.skip();
+    const in_path = args_iter.next() orelse return error.MissingArg;
+
     const input = try std.fs.cwd().readFileAlloc(
         allocator,
         in_path,
@@ -29,5 +29,5 @@ pub fn main() !void {
         const width = display_width.strWidth(line);
         result += width;
     }
-    std.debug.print("zg DisplayWidth.strWidth: result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });
+    std.debug.print("zg DisplayWidth.strWidth: result: {}, took: {}\n", .{ result, std.fmt.fmtDuration(timer.lap() / std.time.ns_per_ms) });
 }
diff --git a/bench/src/ziglyph_case.zig b/bench/src/ziglyph_case.zig
index c6ef6ec..2b49e5a 100644
--- a/bench/src/ziglyph_case.zig
+++ b/bench/src/ziglyph_case.zig
@@ -3,14 +3,14 @@ const std = @import("std");
 const ziglyph = @import("ziglyph");
 
 pub fn main() !void {
-    var args_iter = std.process.args();
-    _ = args_iter.skip();
-    const in_path = args_iter.next() orelse return error.MissingArg;
-
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena.deinit();
     const allocator = arena.allocator();
 
+    var args_iter = try std.process.argsWithAllocator(allocator);
+    _ = args_iter.skip();
+    const in_path = args_iter.next() orelse return error.MissingArg;
+
     const input = try std.fs.cwd().readFileAlloc(
         allocator,
         in_path,
@@ -27,7 +27,7 @@ pub fn main() !void {
         const lower = try ziglyph.toLowerStr(allocator, line);
         result += upper.len + lower.len;
     }
-    std.debug.print("Ziglyph toUpperStr/toLowerStr: result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });
+    std.debug.print("Ziglyph toUpperStr/toLowerStr: result: {}, took: {}\n", .{ result, std.fmt.fmtDuration(timer.lap() / std.time.ns_per_ms) });
 
     result = 0;
     iter.reset();
@@ -37,5 +37,5 @@ pub fn main() !void {
         if (ziglyph.isUpperStr(line)) result += 1;
         if (ziglyph.isLowerStr(line)) result += 2;
     }
-    std.debug.print("Ziglyph isUpperStr/isLowerStr: result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });
+    std.debug.print("Ziglyph isUpperStr/isLowerStr: result: {}, took: {}\n", .{ result, std.fmt.fmtDuration(timer.lap() / std.time.ns_per_ms) });
 }
diff --git a/bench/src/ziglyph_caseless.zig b/bench/src/ziglyph_caseless.zig
index f80668e..842de44 100644
--- a/bench/src/ziglyph_caseless.zig
+++ b/bench/src/ziglyph_caseless.zig
@@ -3,14 +3,14 @@ const std = @import("std");
 const Normalizer = @import("ziglyph").Normalizer;
 
 pub fn main() !void {
-    var args_iter = std.process.args();
-    _ = args_iter.skip();
-    const in_path = args_iter.next() orelse return error.MissingArg;
-
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena.deinit();
     const allocator = arena.allocator();
 
+    var args_iter = try std.process.argsWithAllocator(allocator);
+    _ = args_iter.skip();
+    const in_path = args_iter.next() orelse return error.MissingArg;
+
     const input = try std.fs.cwd().readFileAlloc(
         allocator,
         in_path,
@@ -31,5 +31,5 @@ pub fn main() !void {
         @memcpy(buf[0..line.len], line);
         prev_line = buf[0..line.len];
     }
-    std.debug.print("Ziglyph Normalizer.eqlCaseless: result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });
+    std.debug.print("Ziglyph Normalizer.eqlCaseless: result: {}, took: {}\n", .{ result, std.fmt.fmtDuration(timer.lap() / std.time.ns_per_ms) });
 }
diff --git a/bench/src/ziglyph_codepoint.zig b/bench/src/ziglyph_codepoint.zig
index 4c8fc18..4265d97 100644
--- a/bench/src/ziglyph_codepoint.zig
+++ b/bench/src/ziglyph_codepoint.zig
@@ -3,14 +3,14 @@ const std = @import("std");
 const CodePointIterator = @import("ziglyph").CodePointIterator;
 
 pub fn main() !void {
-    var args_iter = std.process.args();
-    _ = args_iter.skip();
-    const in_path = args_iter.next() orelse return error.MissingArg;
-
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena.deinit();
     const allocator = arena.allocator();
 
+    var args_iter = try std.process.argsWithAllocator(allocator);
+    _ = args_iter.skip();
+    const in_path = args_iter.next() orelse return error.MissingArg;
+
     const input = try std.fs.cwd().readFileAlloc(
         allocator,
         in_path,
@@ -23,5 +23,5 @@ pub fn main() !void {
     var timer = try std.time.Timer.start();
 
     while (iter.next()) |_| result += 1;
-    std.debug.print("Ziglyph CodePointIterator: result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });
+    std.debug.print("Ziglyph CodePointIterator: result: {}, took: {}\n", .{ result, std.fmt.fmtDuration(timer.lap() / std.time.ns_per_ms) });
 }
diff --git a/bench/src/ziglyph_grapheme.zig b/bench/src/ziglyph_grapheme.zig
index b47eea3..4ce9da1 100644
--- a/bench/src/ziglyph_grapheme.zig
+++ b/bench/src/ziglyph_grapheme.zig
@@ -3,14 +3,14 @@ const std = @import("std");
 const GraphemeIterator = @import("ziglyph").GraphemeIterator;
 
 pub fn main() !void {
-    var args_iter = std.process.args();
-    _ = args_iter.skip();
-    const in_path = args_iter.next() orelse return error.MissingArg;
-
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena.deinit();
     const allocator = arena.allocator();
 
+    var args_iter = try std.process.argsWithAllocator(allocator);
+    _ = args_iter.skip();
+    const in_path = args_iter.next() orelse return error.MissingArg;
+
     const input = try std.fs.cwd().readFileAlloc(
         allocator,
         in_path,
@@ -23,5 +23,5 @@ pub fn main() !void {
     var timer = try std.time.Timer.start();
 
     while (iter.next()) |_| result += 1;
-    std.debug.print("Ziglyph GraphemeIterator: result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });
+    std.debug.print("Ziglyph GraphemeIterator: result: {}, took: {}\n", .{ result, std.fmt.fmtDuration(timer.lap() / std.time.ns_per_ms) });
 }
diff --git a/bench/src/ziglyph_normalizer.zig b/bench/src/ziglyph_normalizer.zig
index fea162c..fa077f4 100644
--- a/bench/src/ziglyph_normalizer.zig
+++ b/bench/src/ziglyph_normalizer.zig
@@ -3,14 +3,14 @@ const std = @import("std");
 const Normalizer = @import("ziglyph").Normalizer;
 
 pub fn main() !void {
-    var args_iter = std.process.args();
-    _ = args_iter.skip();
-    const in_path = args_iter.next() orelse return error.MissingArg;
-
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena.deinit();
     const allocator = arena.allocator();
 
+    var args_iter = try std.process.argsWithAllocator(allocator);
+    _ = args_iter.skip();
+    const in_path = args_iter.next() orelse return error.MissingArg;
+
     const input = try std.fs.cwd().readFileAlloc(
         allocator,
         in_path,
@@ -28,7 +28,7 @@ pub fn main() !void {
         const nfkc = try normalizer.nfkc(allocator, line);
         result += nfkc.slice.len;
     }
-    std.debug.print("Ziglyph Normalizer.nfkc: result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });
+    std.debug.print("Ziglyph Normalizer.nfkc: result: {}, took: {}\n", .{ result, std.fmt.fmtDuration(timer.lap() / std.time.ns_per_ms) });
 
     result = 0;
     iter.reset();
@@ -38,7 +38,7 @@ pub fn main() !void {
         const nfc = try normalizer.nfc(allocator, line);
         result += nfc.slice.len;
     }
-    std.debug.print("Ziglyph Normalizer.nfc: result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });
+    std.debug.print("Ziglyph Normalizer.nfc: result: {}, took: {}\n", .{ result, std.fmt.fmtDuration(timer.lap() / std.time.ns_per_ms) });
 
     result = 0;
     iter.reset();
@@ -48,7 +48,7 @@ pub fn main() !void {
         const nfkd = try normalizer.nfkd(allocator, line);
         result += nfkd.slice.len;
     }
-    std.debug.print("Ziglyph Normalizer.nfkd: result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });
+    std.debug.print("Ziglyph Normalizer.nfkd: result: {}, took: {}\n", .{ result, std.fmt.fmtDuration(timer.lap() / std.time.ns_per_ms) });
 
     result = 0;
     iter.reset();
@@ -58,7 +58,7 @@ pub fn main() !void {
         const nfd = try normalizer.nfd(allocator, line);
         result += nfd.slice.len;
     }
-    std.debug.print("Ziglyph Normalizer.nfd: result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });
+    std.debug.print("Ziglyph Normalizer.nfd: result: {}, took: {}\n", .{ result, std.fmt.fmtDuration(timer.lap() / std.time.ns_per_ms) });
 
     result = 0;
     iter.reset();
@@ -71,5 +71,5 @@ pub fn main() !void {
         @memcpy(buf[0..line.len], line);
         prev_line = buf[0..line.len];
     }
-    std.debug.print("Ziglyph Normalizer.eql: result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });
+    std.debug.print("Ziglyph Normalizer.eql: result: {}, took: {}\n", .{ result, std.fmt.fmtDuration(timer.lap() / std.time.ns_per_ms) });
 }
diff --git a/bench/src/ziglyph_width.zig b/bench/src/ziglyph_width.zig
index 01dd9ee..b923d24 100644
--- a/bench/src/ziglyph_width.zig
+++ b/bench/src/ziglyph_width.zig
@@ -3,14 +3,14 @@ const std = @import("std");
 const display_width = @import("ziglyph").display_width;
 
 pub fn main() !void {
-    var args_iter = std.process.args();
-    _ = args_iter.skip();
-    const in_path = args_iter.next() orelse return error.MissingArg;
-
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena.deinit();
     const allocator = arena.allocator();
 
+    var args_iter = try std.process.argsWithAllocator(allocator);
+    _ = args_iter.skip();
+    const in_path = args_iter.next() orelse return error.MissingArg;
+
     const input = try std.fs.cwd().readFileAlloc(
         allocator,
         in_path,
@@ -26,5 +26,5 @@ pub fn main() !void {
         const width = try display_width.strWidth(line, .half);
         result += width;
     }
-    std.debug.print("Ziglyph display_width.strWidth: result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });
+    std.debug.print("Ziglyph display_width.strWidth: result: {}, took: {}\n", .{ result, std.fmt.fmtDuration(timer.lap() / std.time.ns_per_ms) });
 }
-- 
cgit v1.2.3