all: zig fmt and rename "@XToY" to "@YFromX"
Signed-off-by: Eric Joldasov <bratishkaerik@getgoogleoff.me>
This commit is contained in:
committed by
Andrew Kelley
parent
a6c8ee5231
commit
50339f595a
@@ -64,7 +64,7 @@ pub fn MultiArrayList(comptime T: type) type {
|
||||
/// and then get the field arrays from the slice.
|
||||
pub const Slice = struct {
|
||||
/// This array is indexed by the field index which can be obtained
|
||||
/// by using @enumToInt() on the Field enum
|
||||
/// by using @intFromEnum() on the Field enum
|
||||
ptrs: [fields.len][*]u8,
|
||||
len: usize,
|
||||
capacity: usize,
|
||||
@@ -74,7 +74,7 @@ pub fn MultiArrayList(comptime T: type) type {
|
||||
if (self.capacity == 0) {
|
||||
return &[_]F{};
|
||||
}
|
||||
const byte_ptr = self.ptrs[@enumToInt(field)];
|
||||
const byte_ptr = self.ptrs[@intFromEnum(field)];
|
||||
const casted_ptr: [*]F = if (@sizeOf(F) == 0)
|
||||
undefined
|
||||
else
|
||||
@@ -89,14 +89,14 @@ pub fn MultiArrayList(comptime T: type) type {
|
||||
else => unreachable,
|
||||
};
|
||||
inline for (fields, 0..) |field_info, i| {
|
||||
self.items(@intToEnum(Field, i))[index] = @field(e, field_info.name);
|
||||
self.items(@enumFromInt(Field, i))[index] = @field(e, field_info.name);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get(self: Slice, index: usize) T {
|
||||
var result: Elem = undefined;
|
||||
inline for (fields, 0..) |field_info, i| {
|
||||
@field(result, field_info.name) = self.items(@intToEnum(Field, i))[index];
|
||||
@field(result, field_info.name) = self.items(@enumFromInt(Field, i))[index];
|
||||
}
|
||||
return switch (@typeInfo(T)) {
|
||||
.Struct => result,
|
||||
@@ -294,7 +294,7 @@ pub fn MultiArrayList(comptime T: type) type {
|
||||
};
|
||||
const slices = self.slice();
|
||||
inline for (fields, 0..) |field_info, field_index| {
|
||||
const field_slice = slices.items(@intToEnum(Field, field_index));
|
||||
const field_slice = slices.items(@enumFromInt(Field, field_index));
|
||||
var i: usize = self.len - 1;
|
||||
while (i > index) : (i -= 1) {
|
||||
field_slice[i] = field_slice[i - 1];
|
||||
@@ -309,7 +309,7 @@ pub fn MultiArrayList(comptime T: type) type {
|
||||
pub fn swapRemove(self: *Self, index: usize) void {
|
||||
const slices = self.slice();
|
||||
inline for (fields, 0..) |_, i| {
|
||||
const field_slice = slices.items(@intToEnum(Field, i));
|
||||
const field_slice = slices.items(@enumFromInt(Field, i));
|
||||
field_slice[index] = field_slice[self.len - 1];
|
||||
field_slice[self.len - 1] = undefined;
|
||||
}
|
||||
@@ -321,7 +321,7 @@ pub fn MultiArrayList(comptime T: type) type {
|
||||
pub fn orderedRemove(self: *Self, index: usize) void {
|
||||
const slices = self.slice();
|
||||
inline for (fields, 0..) |_, field_index| {
|
||||
const field_slice = slices.items(@intToEnum(Field, field_index));
|
||||
const field_slice = slices.items(@enumFromInt(Field, field_index));
|
||||
var i = index;
|
||||
while (i < self.len - 1) : (i += 1) {
|
||||
field_slice[i] = field_slice[i + 1];
|
||||
@@ -358,7 +358,7 @@ pub fn MultiArrayList(comptime T: type) type {
|
||||
const self_slice = self.slice();
|
||||
inline for (fields, 0..) |field_info, i| {
|
||||
if (@sizeOf(field_info.type) != 0) {
|
||||
const field = @intToEnum(Field, i);
|
||||
const field = @enumFromInt(Field, i);
|
||||
const dest_slice = self_slice.items(field)[new_len..];
|
||||
// We use memset here for more efficient codegen in safety-checked,
|
||||
// valgrind-enabled builds. Otherwise the valgrind client request
|
||||
@@ -379,7 +379,7 @@ pub fn MultiArrayList(comptime T: type) type {
|
||||
const other_slice = other.slice();
|
||||
inline for (fields, 0..) |field_info, i| {
|
||||
if (@sizeOf(field_info.type) != 0) {
|
||||
const field = @intToEnum(Field, i);
|
||||
const field = @enumFromInt(Field, i);
|
||||
@memcpy(other_slice.items(field), self_slice.items(field));
|
||||
}
|
||||
}
|
||||
@@ -440,7 +440,7 @@ pub fn MultiArrayList(comptime T: type) type {
|
||||
const other_slice = other.slice();
|
||||
inline for (fields, 0..) |field_info, i| {
|
||||
if (@sizeOf(field_info.type) != 0) {
|
||||
const field = @intToEnum(Field, i);
|
||||
const field = @enumFromInt(Field, i);
|
||||
@memcpy(other_slice.items(field), self_slice.items(field));
|
||||
}
|
||||
}
|
||||
@@ -459,7 +459,7 @@ pub fn MultiArrayList(comptime T: type) type {
|
||||
const result_slice = result.slice();
|
||||
inline for (fields, 0..) |field_info, i| {
|
||||
if (@sizeOf(field_info.type) != 0) {
|
||||
const field = @intToEnum(Field, i);
|
||||
const field = @enumFromInt(Field, i);
|
||||
@memcpy(result_slice.items(field), self_slice.items(field));
|
||||
}
|
||||
}
|
||||
@@ -476,7 +476,7 @@ pub fn MultiArrayList(comptime T: type) type {
|
||||
pub fn swap(sc: @This(), a_index: usize, b_index: usize) void {
|
||||
inline for (fields, 0..) |field_info, i| {
|
||||
if (@sizeOf(field_info.type) != 0) {
|
||||
const field = @intToEnum(Field, i);
|
||||
const field = @enumFromInt(Field, i);
|
||||
const ptr = sc.slice.items(field);
|
||||
mem.swap(field_info.type, &ptr[a_index], &ptr[b_index]);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user