Refactored the arg iterators to new be static interface implementations

* This makes arg iterators easier to understand and implement
* It should also be faster than using the fieldToParent builtin

2 files changed, 6 insertions, 8 deletions

diff --git a/example/comptime-clap.zig b/example/comptime-clap.zig
index b275dc7..8517db8 100644
--- a/example/comptime-clap.zig
+++ b/example/comptime-clap.zig
@@ -27,15 +27,14 @@ pub fn main() !void {
 
     // We then initialize an argument iterator. We will use the OsIterator as it nicely
     // wraps iterating over arguments the most efficient way on each os.
-    var os_iter = clap.args.OsIterator.init(allocator);
-    const iter = &os_iter.iter;
-    defer os_iter.deinit();
+    var iter = clap.args.OsIterator.init(allocator);
+    defer iter.deinit();
 
     // Consume the exe arg.
     const exe = try iter.next();
 
     // Finally we can parse the arguments
-    var args = try clap.ComptimeClap([]const u8, params).parse(allocator, clap.args.OsIterator.Error, iter);
+    var args = try clap.ComptimeClap([]const u8, params).parse(allocator, clap.args.OsIterator, &iter);
     defer args.deinit();
 
     // clap.help is a function that can print a simple help message, given a
diff --git a/example/streaming-clap.zig b/example/streaming-clap.zig
index 57ebe71..a52a222 100644
--- a/example/streaming-clap.zig
+++ b/example/streaming-clap.zig
@@ -17,15 +17,14 @@ pub fn main() !void {
 
     // We then initialize an argument iterator. We will use the OsIterator as it nicely
     // wraps iterating over arguments the most efficient way on each os.
-    var os_iter = clap.args.OsIterator.init(allocator);
-    const iter = &os_iter.iter;
-    defer os_iter.deinit();
+    var iter = clap.args.OsIterator.init(allocator);
+    defer iter.deinit();
 
     // Consume the exe arg.
     const exe = try iter.next();
 
     // Finally we initialize our streaming parser.
-    var parser = clap.StreamingClap(u8, clap.args.OsIterator.Error).init(params, iter);
+    var parser = clap.StreamingClap(u8, clap.args.OsIterator).init(params, &iter);
 
     // Because we use a streaming parser, we have to consume each argument parsed individually.
     while (try parser.next()) |arg| {