From ccb18ace3786f8d03fce3077ee430d79e3f804ee Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Wed, 4 Jul 2018 12:06:20 -0400
Subject: [PATCH] update to latest zig

---
 src/main.zig | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/main.zig b/src/main.zig
index 5a5be8a..dd2204d 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -3,7 +3,6 @@ const c = @cImport({
 });
 const assert = @import("std").debug.assert;
 
-
 // See https://github.com/zig-lang/zig/issues/565
 // SDL_video.h:#define SDL_WINDOWPOS_UNDEFINED         SDL_WINDOWPOS_UNDEFINED_DISPLAY(0)
 // SDL_video.h:#define SDL_WINDOWPOS_UNDEFINED_DISPLAY(X)  (SDL_WINDOWPOS_UNDEFINED_MASK|(X))
@@ -31,37 +30,36 @@ pub fn main() !void {
     }
     defer c.SDL_Quit();
 
-    const screen = c.SDL_CreateWindow(c"My Game Window",
-            SDL_WINDOWPOS_UNDEFINED,
-            SDL_WINDOWPOS_UNDEFINED,
-            300, 73,
-            c.SDL_WINDOW_OPENGL) ??
-    {
+    const screen = c.SDL_CreateWindow(c"My Game Window", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 300, 73, c.SDL_WINDOW_OPENGL) orelse
+        {
         c.SDL_Log(c"Unable to create window: %s", c.SDL_GetError());
         return error.SDLInitializationFailed;
     };
     defer c.SDL_DestroyWindow(screen);
 
-    const renderer = c.SDL_CreateRenderer(screen, -1, 0) ?? {
+    const renderer = c.SDL_CreateRenderer(screen, -1, 0) orelse {
         c.SDL_Log(c"Unable to create renderer: %s", c.SDL_GetError());
         return error.SDLInitializationFailed;
     };
     defer c.SDL_DestroyRenderer(renderer);
 
     const zig_bmp = @embedFile("zig.bmp");
-    const rw = c.SDL_RWFromConstMem(@ptrCast(*const c_void, &zig_bmp[0]), c_int(zig_bmp.len)) ?? {
+    const rw = c.SDL_RWFromConstMem(
+        @ptrCast(*const c_void, &zig_bmp[0]),
+        @intCast(c_int, zig_bmp.len),
+    ) orelse {
         c.SDL_Log(c"Unable to get RWFromConstMem: %s", c.SDL_GetError());
         return error.SDLInitializationFailed;
     };
     defer assert(SDL_RWclose(rw) == 0);
 
-    const zig_surface = c.SDL_LoadBMP_RW(rw, 0) ?? {
+    const zig_surface = c.SDL_LoadBMP_RW(rw, 0) orelse {
         c.SDL_Log(c"Unable to load bmp: %s", c.SDL_GetError());
         return error.SDLInitializationFailed;
     };
     defer c.SDL_FreeSurface(zig_surface);
 
-    const zig_texture = c.SDL_CreateTextureFromSurface(renderer, zig_surface) ?? {
+    const zig_texture = c.SDL_CreateTextureFromSurface(renderer, zig_surface) orelse {
         c.SDL_Log(c"Unable to create texture from surface: %s", c.SDL_GetError());
         return error.SDLInitializationFailed;
     };