diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-02-03 11:51:29 -0500 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-02-03 11:51:29 -0500 |
| commit | abf5ae6897bb23e49e4232ab8be7ed61ea9520b6 (patch) | |
| tree | a0ff1d117e79a63827995c65d22a3fc4e46a37e1 /std/build.zig | |
| parent | b8f59e14cdbf90cf724ed9e721c1909293f41b3b (diff) | |
| download | zig-abf5ae6897bb23e49e4232ab8be7ed61ea9520b6.tar.gz zig-abf5ae6897bb23e49e4232ab8be7ed61ea9520b6.zip | |
*WIP* error sets - support fns called at comptime
Diffstat (limited to 'std/build.zig')
| -rw-r--r-- | std/build.zig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/std/build.zig b/std/build.zig index 1a5c48e684..216699f355 100644 --- a/std/build.zig +++ b/std/build.zig @@ -554,7 +554,7 @@ pub const Builder = struct { } fn spawnChildEnvMap(self: &Builder, cwd: ?[]const u8, env_map: &const BufMap, - argv: []const []const u8) %void + argv: []const []const u8) !void { if (self.verbose) { printCmd(cwd, argv); @@ -1942,12 +1942,12 @@ pub const RemoveDirStep = struct { pub const Step = struct { name: []const u8, - makeFn: fn(self: &Step) %void, + makeFn: fn(self: &Step) error!void, dependencies: ArrayList(&Step), loop_flag: bool, done_flag: bool, - pub fn init(name: []const u8, allocator: &Allocator, makeFn: fn (&Step)%void) Step { + pub fn init(name: []const u8, allocator: &Allocator, makeFn: fn (&Step)error!void) Step { return Step { .name = name, .makeFn = makeFn, @@ -1972,11 +1972,11 @@ pub const Step = struct { self.dependencies.append(other) catch unreachable; } - fn makeNoOp(self: &Step) %void {} + fn makeNoOp(self: &Step) (error{}!void) {} }; fn doAtomicSymLinks(allocator: &Allocator, output_path: []const u8, filename_major_only: []const u8, - filename_name_only: []const u8) %void + filename_name_only: []const u8) !void { const out_dir = os.path.dirname(output_path); const out_basename = os.path.basename(output_path); |
