diff options
| author | 2020-03-02 19:01:25 +0100 | |
|---|---|---|
| committer | 2020-03-02 19:01:25 +0100 | |
| commit | 9f36694c338e583cead3bbaaaf8bdf4140708685 (patch) | |
| tree | ee382b1dfc247294a140df3ebb5234445b496399 | |
| parent | Merge pull request #14 from dbandstra/update-for-typeof-rename (diff) | |
| parent | update for latest zig (diff) | |
| download | zig-clap-9f36694c338e583cead3bbaaaf8bdf4140708685.tar.gz zig-clap-9f36694c338e583cead3bbaaaf8bdf4140708685.tar.xz zig-clap-9f36694c338e583cead3bbaaaf8bdf4140708685.zip | |
Merge pull request #15 from dbandstra/zig-master
update for latest zig
| -rw-r--r-- | build.zig | 2 | ||||
| -rw-r--r-- | clap/args.zig | 4 |
2 files changed, 3 insertions, 3 deletions
| @@ -58,7 +58,7 @@ fn readMeStep(b: *Builder) *std.build.Step { | |||
| 58 | s.* = std.build.Step.init("ReadMeStep", b.allocator, struct { | 58 | s.* = std.build.Step.init("ReadMeStep", b.allocator, struct { |
| 59 | fn make(step: *std.build.Step) anyerror!void { | 59 | fn make(step: *std.build.Step) anyerror!void { |
| 60 | @setEvalBranchQuota(10000); | 60 | @setEvalBranchQuota(10000); |
| 61 | const file = try std.fs.File.openWrite("README.md"); | 61 | const file = try std.fs.cwd().createFile("README.md", .{}); |
| 62 | const stream = &file.outStream().stream; | 62 | const stream = &file.outStream().stream; |
| 63 | try stream.print(@embedFile("example/README.md.template"), .{ | 63 | try stream.print(@embedFile("example/README.md.template"), .{ |
| 64 | @embedFile("example/simple.zig"), | 64 | @embedFile("example/simple.zig"), |
diff --git a/clap/args.zig b/clap/args.zig index 071f756..0141d86 100644 --- a/clap/args.zig +++ b/clap/args.zig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | const builtin = @import("builtin"); | ||
| 2 | const std = @import("std"); | 1 | const std = @import("std"); |
| 3 | 2 | ||
| 3 | const builtin = std.builtin; | ||
| 4 | const debug = std.debug; | 4 | const debug = std.debug; |
| 5 | const heap = std.heap; | 5 | const heap = std.heap; |
| 6 | const mem = std.mem; | 6 | const mem = std.mem; |
| @@ -70,7 +70,7 @@ pub const OsIterator = struct { | |||
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | pub fn next(iter: *OsIterator) Error!?[]const u8 { | 72 | pub fn next(iter: *OsIterator) Error!?[]const u8 { |
| 73 | if (builtin.os == builtin.Os.windows) { | 73 | if (builtin.os.tag == .windows) { |
| 74 | return try iter.args.next(&iter.arena.allocator) orelse return null; | 74 | return try iter.args.next(&iter.arena.allocator) orelse return null; |
| 75 | } else { | 75 | } else { |
| 76 | return iter.args.nextPosix(); | 76 | return iter.args.nextPosix(); |