Update renamed builtins (#15)

* Update renamed builtins

See: ziglang/zig#16046

* Update builtins to infer target type

See: ziglang/zig#16163

Author: linusg

src/c.zig

@@ -19,7 +19,7 @@ const LinenoiseCompletions = extern struct {
 
     pub fn free(self: *LinenoiseCompletions) void {
         if (self.cvec) |raw_completions| {
-            const len = @intCast(usize, self.len);
+            const len: usize = @intCast(self.len);
             for (raw_completions[0..len]) |x| global_allocator.free(mem.span(x));
             global_allocator.free(raw_completions[0..len]);
         }
@@ -129,7 +129,7 @@ export fn linenoise(prompt: [*:0]const u8) ?[*:0]u8 {
 }
 
 export fn linenoiseFree(ptr: *anyopaque) void {
-    global_allocator.free(mem.span(@ptrCast([*:0]const u8, ptr)));
+    global_allocator.free(mem.span(@as([*:0]const u8, @ptrCast(ptr))));
 }
 
 export fn linenoiseHistoryAdd(line: [*:0]const u8) c_int {
@@ -140,7 +140,7 @@ export fn linenoiseHistoryAdd(line: [*:0]const u8) c_int {
 
 export fn linenoiseHistorySetMaxLen(len: c_int) c_int {
     if (global_linenoise == null) global_linenoise = Linenoise.init(global_allocator);
-    global_linenoise.?.history.setMaxLen(@intCast(usize, len)) catch return -1;
+    global_linenoise.?.history.setMaxLen(@intCast(len)) catch return -1;
     return 0;
 }
 

src/state.zig

@@ -93,7 +93,7 @@ fn calculateStartOrEnd(
 
     var utf8 = (try std.unicode.Utf8View.init(buf)).iterator();
     while (utf8.nextCodepointSlice()) |codepoint| {
-        map.appendAssumeCapacity(@ptrToInt(codepoint.ptr) - @ptrToInt(buf.ptr));
+        map.appendAssumeCapacity(@intFromPtr(codepoint.ptr) - @intFromPtr(buf.ptr));
     }
 
     const codepoint_start = binarySearchBestEffort(

src/term.zig

@@ -59,20 +59,20 @@ pub fn enableRawMode(in: File, out: File) !termios {
         var raw = orig;
 
         // TODO fix hardcoding of linux
-        raw.iflag &= ~(@intCast(tcflag_t, std.os.linux.BRKINT) |
-            @intCast(tcflag_t, std.os.linux.ICRNL) |
-            @intCast(tcflag_t, std.os.linux.INPCK) |
-            @intCast(tcflag_t, std.os.linux.ISTRIP) |
-            @intCast(tcflag_t, std.os.linux.IXON));
+        raw.iflag &= ~(@as(tcflag_t, @intCast(std.os.linux.BRKINT)) |
+            @as(tcflag_t, @intCast(std.os.linux.ICRNL)) |
+            @as(tcflag_t, @intCast(std.os.linux.INPCK)) |
+            @as(tcflag_t, @intCast(std.os.linux.ISTRIP)) |
+            @as(tcflag_t, @intCast(std.os.linux.IXON)));
 
-        raw.oflag &= ~(@intCast(tcflag_t, std.os.linux.OPOST));
+        raw.oflag &= ~(@as(tcflag_t, @intCast(std.os.linux.OPOST)));
 
-        raw.cflag |= (@intCast(tcflag_t, std.os.linux.CS8));
+        raw.cflag |= (@as(tcflag_t, @intCast(std.os.linux.CS8)));
 
-        raw.lflag &= ~(@intCast(tcflag_t, std.os.linux.ECHO) |
-            @intCast(tcflag_t, std.os.linux.ICANON) |
-            @intCast(tcflag_t, std.os.linux.IEXTEN) |
-            @intCast(tcflag_t, std.os.linux.ISIG));
+        raw.lflag &= ~(@as(tcflag_t, @intCast(std.os.linux.ECHO)) |
+            @as(tcflag_t, @intCast(std.os.linux.ICANON)) |
+            @as(tcflag_t, @intCast(std.os.linux.IEXTEN)) |
+            @as(tcflag_t, @intCast(std.os.linux.ISIG)));
 
         // FIXME
         // raw.cc[std.os.VMIN] = 1;
@@ -131,7 +131,7 @@ pub fn getColumns(in: File, out: File) !usize {
     switch (builtin.os.tag) {
         .linux => {
             var wsz: std.os.linux.winsize = undefined;
-            if (std.os.linux.ioctl(in.handle, std.os.linux.T.IOCGWINSZ, @ptrToInt(&wsz)) == 0) {
+            if (std.os.linux.ioctl(in.handle, std.os.linux.T.IOCGWINSZ, @intFromPtr(&wsz)) == 0) {
                 return wsz.ws_col;
             } else {
                 return try getColumnsFallback(in, out);
@@ -140,7 +140,7 @@ pub fn getColumns(in: File, out: File) !usize {
         .windows => {
             var csbi: w.CONSOLE_SCREEN_BUFFER_INFO = undefined;
             _ = k32.GetConsoleScreenBufferInfo(out.handle, &csbi);
-            return @intCast(usize, csbi.dwSize.X);
+            return @intCast(csbi.dwSize.X);
         },
         else => return try getColumnsFallback(in, out),
     }

src/unicode.zig

@@ -21,7 +21,7 @@ pub fn width(s: []const u8) usize {
             } else {
                 const wcw = wcwidth(codepoint);
                 if (wcw < 0) return 0;
-                result += @intCast(usize, wcw);
+                result += @intCast(wcw);
             }
         }
     }