fmt, mv src/ clap/ and run fmt on build

5 files changed, 14 insertions, 10 deletions

diff --git a/build.zig b/build.zig
index 104e7e3..9d2ef7b 100644
--- a/build.zig
+++ b/build.zig
@@ -7,6 +7,11 @@ const Builder = std.build.Builder;
 pub fn build(b: *Builder) void {
     const mode = b.standardReleaseOptions();
 
+    const fmt_step = b.addFmt([_][]const u8{
+        "build.zig",
+        "clap",
+    });
+
     const test_all_step = b.step("test", "Run all tests in all modes.");
     inline for ([_]Mode{ Mode.Debug, Mode.ReleaseFast, Mode.ReleaseSafe, Mode.ReleaseSmall }) |test_mode| {
         const mode_str = comptime modeToString(test_mode);
diff --git a/clap.zig b/clap.zig
index ac7f6c1..1a6a95d 100644
--- a/clap.zig
+++ b/clap.zig
@@ -5,7 +5,7 @@ const io = std.io;
 const mem = std.mem;
 const testing = std.testing;
 
-pub const args = @import("src/args.zig");
+pub const args = @import("clap/args.zig");
 
 test "clap" {
     _ = args;
@@ -13,8 +13,8 @@ test "clap" {
     _ = StreamingClap;
 }
 
-pub const ComptimeClap = @import("src/comptime.zig").ComptimeClap;
-pub const StreamingClap = @import("src/streaming.zig").StreamingClap;
+pub const ComptimeClap = @import("clap/comptime.zig").ComptimeClap;
+pub const StreamingClap = @import("clap/streaming.zig").StreamingClap;
 
 /// The names a ::Param can have.
 pub const Names = struct {
@@ -69,7 +69,7 @@ pub fn parseParam(line: []const u8) !Param(Help) {
     if (!mem.startsWith(u8, param_str, "--") and mem.startsWith(u8, param_str, "-")) {
         const found_comma = param_str[param_str.len - 1] == ',';
         if (found_comma)
-            param_str = param_str[0..param_str.len - 1];
+            param_str = param_str[0 .. param_str.len - 1];
 
         if (param_str.len != 2)
             return error.InvalidShortParam;
@@ -83,7 +83,7 @@ pub fn parseParam(line: []const u8) !Param(Help) {
                     const len = mem.indexOfScalar(u8, help_msg[start..], '>') orelse break :blk;
                     res.id.value = help_msg[start..][0..len];
                     res.takes_value = true;
-                    help_msg = help_msg[start + len + 1..];
+                    help_msg = help_msg[start + len + 1 ..];
                 }
             }
 
@@ -99,7 +99,7 @@ pub fn parseParam(line: []const u8) !Param(Help) {
 
         if (param_str[param_str.len - 1] == ',')
             return error.TrailingComma;
-    
+
         var help_msg = it.rest();
         if (it.next()) |next| blk: {
             if (mem.startsWith(u8, next, "<")) {
@@ -107,10 +107,10 @@ pub fn parseParam(line: []const u8) !Param(Help) {
                 const len = mem.indexOfScalar(u8, help_msg[start..], '>') orelse break :blk;
                 res.id.value = help_msg[start..][0..len];
                 res.takes_value = true;
-                help_msg = help_msg[start + len + 1..];
+                help_msg = help_msg[start + len + 1 ..];
             }
         }
-        
+
         res.id.msg = mem.trim(u8, help_msg, " \t");
         return res;
     }
@@ -223,7 +223,6 @@ fn find(str: []const u8, f: []const u8) []const u8 {
     return str[i..][0..f.len];
 }
 
-
 /// Will print a help message in the following format:
 ///     -s, --long <value_text> help_text
 ///     -s,                     help_text
diff --git a/src/args.zig b/clap/args.zig
index 4234ada..4234ada 100644
--- a/src/args.zig
+++ b/clap/args.zig
diff --git a/src/comptime.zig b/clap/comptime.zig
index f5c2762..f5c2762 100644
--- a/src/comptime.zig
+++ b/clap/comptime.zig
diff --git a/src/streaming.zig b/clap/streaming.zig
index b5c3498..fa7ce80 100644
--- a/src/streaming.zig
+++ b/clap/streaming.zig
@@ -321,7 +321,7 @@ test "clap.streaming.StreamingClap: all params" {
             "-c",   "0",     "-c=0",   "-ac",
             "0",    "-ac=0", "--aa",   "--bb",
             "--cc", "0",     "--cc=0", "something",
-            "--", "-",
+            "--",   "-",
         },
         [_]Arg(u8){
             Arg(u8){ .param = aa },