From bfb15f1c9f1b4a33cfd8e58cdefc3a0d98a015d2 Mon Sep 17 00:00:00 2001 From: Vexu Date: Thu, 5 Dec 2019 20:20:38 +0200 Subject: [PATCH] fix casts --- lib/std/c/hermit.zig | 4 ++-- lib/std/meta.zig | 2 +- lib/std/os/bits/linux.zig | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/std/c/hermit.zig b/lib/std/c/hermit.zig index b9be76c3bac61f4444e24edc54a630b8289e395a..1730aa43ac18874491038d1d732b6d5d6d892ef5 100644 --- a/lib/std/c/hermit.zig +++ b/lib/std/c/hermit.zig @@ -1,6 +1,6 @@ pub const pthread_mutex_t = extern struct { - inner: usize = ~usize(0), + inner: usize = ~@as(usize, 0), }; pub const pthread_cond_t = extern struct { - inner: usize = ~usize(0), + inner: usize = ~@as(usize, 0), }; diff --git a/lib/std/meta.zig b/lib/std/meta.zig index b770b97a471609e8cdb1bf81f1f385fc75ae49e0..2352c0bfffef7887560be8f4ce29152ce0221a32 100644 --- a/lib/std/meta.zig +++ b/lib/std/meta.zig @@ -548,7 +548,7 @@ pub fn intToEnum(comptime Tag: type, tag_int: var) IntToEnumError!Tag { pub fn fieldIndex(comptime T: type, comptime name: []const u8) ?comptime_int { inline for (fields(T)) |field, i| { if (mem.eql(u8, field.name, name)) - return comptime_int(i); + return i; } return null; } diff --git a/lib/std/os/bits/linux.zig b/lib/std/os/bits/linux.zig index 52cc5a710dfb9569773096dd4be194bc19d0e8f4..a6d010e26d3a43a8242d3f58b95205d7a8b4fe17 100644 --- a/lib/std/os/bits/linux.zig +++ b/lib/std/os/bits/linux.zig @@ -951,7 +951,7 @@ pub fn cap_valid(u8: x) bool { } pub fn CAP_TO_MASK(cap: u8) u32 { - return @as(u32, 1) << u5(cap & 31); + return @as(u32, 1) << @intCast(u5, cap & 31); } pub fn CAP_TO_INDEX(cap: u8) u8 { -- 2.54.0