fix darwin and windows from previous commit

andrewrk · andrewrk · commit ea805c5fe7a8 · 2017-12-22T02:33:39.000-05:00
diff --git a/std/os/child_process.zig b/std/os/child_process.zig
@@ -560,12 +560,14 @@ pub const ChildProcess = struct {
 
         // the cwd set in ChildProcess is in effect when choosing the executable path
         // to match posix semantics
-        const app_name = if (self.cwd) |cwd| x: {
-            const resolved = %return os.path.resolve(self.allocator, cwd, self.argv[0]);
-            defer self.allocator.free(resolved);
-            break :x %return cstr.addNullByte(self.allocator, resolved);
-        } else x: {
-            break :x %return cstr.addNullByte(self.allocator, self.argv[0]);
+        const app_name = x: {
+            if (self.cwd) |cwd| {
+                const resolved = %return os.path.resolve(self.allocator, cwd, self.argv[0]);
+                defer self.allocator.free(resolved);
+                break :x %return cstr.addNullByte(self.allocator, resolved);
+            } else {
+                break :x %return cstr.addNullByte(self.allocator, self.argv[0]);
+            }
         };
         defer self.allocator.free(app_name);
 
diff --git a/std/os/darwin.zig b/std/os/darwin.zig
@@ -117,11 +117,11 @@ pub fn close(fd: i32) -> usize {
 }
 
 pub fn abort() -> noreturn {
-    return c.abort();
+    c.abort();
 }
 
 pub fn exit(code: i32) -> noreturn {
-    return c.exit(code);
+    c.exit(code);
 }
 
 pub fn isatty(fd: i32) -> bool {
diff --git a/std/os/windows/util.zig b/std/os/windows/util.zig
@@ -16,11 +16,11 @@ pub fn windowsWaitSingle(handle: windows.HANDLE, milliseconds: windows.DWORD) ->
         windows.WAIT_ABANDONED => error.WaitAbandoned,
         windows.WAIT_OBJECT_0 => {},
         windows.WAIT_TIMEOUT => error.WaitTimeOut,
-        windows.WAIT_FAILED => {
+        windows.WAIT_FAILED => x: {
             const err = windows.GetLastError();
-            switch (err) {
+            break :x switch (err) {
                 else => os.unexpectedErrorWindows(err),
-            }
+            };
         },
         else => error.Unexpected,
     };

Original file line number	Diff line number	Diff line change
`@@ -117,11 +117,11 @@ pub fn close(fd: i32) -> usize {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`pub fn abort() -> noreturn {`
`120`		`- return c.abort();`
	`120`	`+ c.abort();`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`pub fn exit(code: i32) -> noreturn {`
`124`		`- return c.exit(code);`
	`124`	`+ c.exit(code);`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`pub fn isatty(fd: i32) -> bool {`