aboutsummaryrefslogtreecommitdiff
path: root/lib/std/meta
diff options
context:
space:
mode:
Diffstat (limited to 'lib/std/meta')
-rw-r--r--lib/std/meta/trailer_flags.zig6
-rw-r--r--lib/std/meta/trait.zig2
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/std/meta/trailer_flags.zig b/lib/std/meta/trailer_flags.zig
index cf37fc5adf..d028f88066 100644
--- a/lib/std/meta/trailer_flags.zig
+++ b/lib/std/meta/trailer_flags.zig
@@ -72,7 +72,7 @@ pub fn TrailerFlags(comptime Fields: type) type {
pub fn setMany(self: Self, p: [*]align(@alignOf(Fields)) u8, fields: FieldValues) void {
inline for (@typeInfo(Fields).Struct.fields, 0..) |field, i| {
if (@field(fields, field.name)) |value|
- self.set(p, @enumFromInt(FieldEnum, i), value);
+ self.set(p, @as(FieldEnum, @enumFromInt(i)), value);
}
}
@@ -89,14 +89,14 @@ pub fn TrailerFlags(comptime Fields: type) type {
if (@sizeOf(Field(field)) == 0)
return undefined;
const off = self.offset(field);
- return @ptrCast(*Field(field), @alignCast(@alignOf(Field(field)), p + off));
+ return @ptrCast(@alignCast(p + off));
}
pub fn ptrConst(self: Self, p: [*]align(@alignOf(Fields)) const u8, comptime field: FieldEnum) *const Field(field) {
if (@sizeOf(Field(field)) == 0)
return undefined;
const off = self.offset(field);
- return @ptrCast(*const Field(field), @alignCast(@alignOf(Field(field)), p + off));
+ return @ptrCast(@alignCast(p + off));
}
pub fn offset(self: Self, comptime field: FieldEnum) usize {
diff --git a/lib/std/meta/trait.zig b/lib/std/meta/trait.zig
index 3d0e0bce5d..e00fac261c 100644
--- a/lib/std/meta/trait.zig
+++ b/lib/std/meta/trait.zig
@@ -237,7 +237,7 @@ pub fn isManyItemPtr(comptime T: type) bool {
test "isManyItemPtr" {
const array = [_]u8{0} ** 10;
- const mip = @ptrCast([*]const u8, &array[0]);
+ const mip = @as([*]const u8, @ptrCast(&array[0]));
try testing.expect(isManyItemPtr(@TypeOf(mip)));
try testing.expect(!isManyItemPtr(@TypeOf(array)));
try testing.expect(!isManyItemPtr(@TypeOf(array[0..1])));