Merge branch 'master' into zig-master

3 files changed, 6 insertions, 2 deletions

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000..2b7106c
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: [Hejsil]
diff --git a/build.zig b/build.zig
index 8ecc3f3..9baf1d4 100644
--- a/build.zig
+++ b/build.zig
@@ -6,6 +6,7 @@ const Builder = std.build.Builder;
 
 pub fn build(b: *Builder) void {
     const mode = b.standardReleaseOptions();
+    const target = b.standardTargetOptions(.{});
 
     const fmt_step = b.addFmt(&[_][]const u8{
         "build.zig",
@@ -20,6 +21,7 @@ pub fn build(b: *Builder) void {
 
         const tests = b.addTest("clap.zig");
         tests.setBuildMode(test_mode);
+        tests.setTarget(target);
         tests.setNamePrefix(mode_str ++ " ");
 
         const test_step = b.step("test-" ++ mode_str, "Run all tests in " ++ mode_str ++ ".");
@@ -39,6 +41,7 @@ pub fn build(b: *Builder) void {
         const example = b.addExecutable(example_name, "example/" ++ example_name ++ ".zig");
         example.addPackagePath("clap", "clap.zig");
         example.setBuildMode(mode);
+        example.setTarget(target);
         example.install();
         example_step.dependOn(&example.step);
     }
diff --git a/clap.zig b/clap.zig
index 209b58f..8624c88 100644
--- a/clap.zig
+++ b/clap.zig
@@ -368,7 +368,7 @@ pub fn helpFull(
             var counting_stream = io.countingOutStream(io.null_out_stream);
             try printParam(counting_stream.outStream(), Id, param, Error, context, valueText);
             if (res < counting_stream.bytes_written)
-                res = counting_stream.bytes_written;
+                res = @intCast(usize, counting_stream.bytes_written);
         }
 
         break :blk res;
@@ -381,7 +381,7 @@ pub fn helpFull(
         var counting_stream = io.countingOutStream(stream);
         try stream.print("\t", .{});
         try printParam(counting_stream.outStream(), Id, param, Error, context, valueText);
-        try stream.writeByteNTimes(' ', max_spacing - counting_stream.bytes_written);
+        try stream.writeByteNTimes(' ', max_spacing - @intCast(usize, counting_stream.bytes_written));
         try stream.print("\t{}\n", .{try helpText(context, param)});
     }
 }