Skip to content

Commit

Permalink
refactor: replace std.meta.fields with @typeinfo
Browse files Browse the repository at this point in the history 
Updated instances of `std.meta.fields` to use `@typeInfo` for retrieving
(struct) fields.

Fix #724
  • Loading branch information
@simonklee
simonklee committed Jul 20, 2024
1 parent 5e576c5 commit fa822b7
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
18 changes: 9 additions & 9 deletions src/aro/Attribute.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ pub fn requiredArgCount(attr: Tag) u32 {
inline else => |tag| {
comptime var needed = 0;
comptime {
const fields = std.meta.fields(@field(attributes, @tagName(tag)));
const fields = @typeInfo(@field(attributes, @tagName(tag))).Struct.fields;
for (fields) |arg_field| {
if (!mem.eql(u8, arg_field.name, "__name_tok") and @typeInfo(arg_field.type) != .Optional) needed += 1;
}
Expand All @@ -83,7 +83,7 @@ pub fn maxArgCount(attr: Tag) u32 {
inline else => |tag| {
comptime var max = 0;
comptime {
const fields = std.meta.fields(@field(attributes, @tagName(tag)));
const fields = @typeInfo(@field(attributes, @tagName(tag))).Struct.fields;
for (fields) |arg_field| {
if (!mem.eql(u8, arg_field.name, "__name_tok")) max += 1;
}
Expand All @@ -108,7 +108,7 @@ pub const Formatting = struct {
switch (attr) {
.calling_convention => unreachable,
inline else => |tag| {
const fields = std.meta.fields(@field(attributes, @tagName(tag)));
const fields = @typeInfo(@field(attributes, @tagName(tag))).Struct.fields;

if (fields.len == 0) unreachable;
const Unwrapped = UnwrapOptional(fields[0].type);
Expand All @@ -125,7 +125,7 @@ pub const Formatting = struct {
switch (attr) {
.calling_convention => unreachable,
inline else => |tag| {
const fields = std.meta.fields(@field(attributes, @tagName(tag)));
const fields = @typeInfo(@field(attributes, @tagName(tag))).Struct.fields;

if (fields.len == 0) unreachable;
const Unwrapped = UnwrapOptional(fields[0].type);
Expand All @@ -150,7 +150,7 @@ pub fn wantsIdentEnum(attr: Tag) bool {
switch (attr) {
.calling_convention => return false,
inline else => |tag| {
const fields = std.meta.fields(@field(attributes, @tagName(tag)));
const fields = @typeInfo(@field(attributes, @tagName(tag))).Struct.fields;

if (fields.len == 0) return false;
const Unwrapped = UnwrapOptional(fields[0].type);
Expand All @@ -164,7 +164,7 @@ pub fn wantsIdentEnum(attr: Tag) bool {
pub fn diagnoseIdent(attr: Tag, arguments: *Arguments, ident: []const u8) ?Diagnostics.Message {
switch (attr) {
inline else => |tag| {
const fields = std.meta.fields(@field(attributes, @tagName(tag)));
const fields = @typeInfo(@field(attributes, @tagName(tag))).Struct.fields;
if (fields.len == 0) unreachable;
const Unwrapped = UnwrapOptional(fields[0].type);
if (@typeInfo(Unwrapped) != .Enum) unreachable;
Expand All @@ -183,7 +183,7 @@ pub fn diagnoseIdent(attr: Tag, arguments: *Arguments, ident: []const u8) ?Diagn
pub fn wantsAlignment(attr: Tag, idx: usize) bool {
switch (attr) {
inline else => |tag| {
const fields = std.meta.fields(@field(attributes, @tagName(tag)));
const fields = @typeInfo(@field(attributes, @tagName(tag))).Struct.fields;
if (fields.len == 0) return false;

return switch (idx) {
Expand All @@ -197,7 +197,7 @@ pub fn wantsAlignment(attr: Tag, idx: usize) bool {
pub fn diagnoseAlignment(attr: Tag, arguments: *Arguments, arg_idx: u32, res: Parser.Result, p: *Parser) !?Diagnostics.Message {
switch (attr) {
inline else => |tag| {
const arg_fields = std.meta.fields(@field(attributes, @tagName(tag)));
const arg_fields = @typeInfo(@field(attributes, @tagName(tag))).Struct.fields;
if (arg_fields.len == 0) unreachable;

switch (arg_idx) {
Expand Down Expand Up @@ -321,7 +321,7 @@ pub fn diagnose(attr: Tag, arguments: *Arguments, arg_idx: u32, res: Parser.Resu
.tag = .attribute_too_many_args,
.extra = .{ .attr_arg_count = .{ .attribute = attr, .expected = max_arg_count } },
};
const arg_fields = std.meta.fields(@field(attributes, decl.name));
const arg_fields = @typeInfo(@field(attributes, decl.name)).Struct.fields;
switch (arg_idx) {
inline 0...arg_fields.len - 1 => |arg_i| {
return diagnoseField(decl, arg_fields[arg_i], UnwrapOptional(arg_fields[arg_i].type), arguments, res, node, p);
Expand Down
4 changes: 2 additions & 2 deletions src/aro/Diagnostics.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,14 +228,14 @@ errors: u32 = 0,
macro_backtrace_limit: u32 = 6,

pub fn warningExists(name: []const u8) bool {
inline for (std.meta.fields(Options)) |f| {
inline for (@typeInfo(Options).Struct.fields) |f| {
if (mem.eql(u8, f.name, name)) return true;
}
return false;
}

pub fn set(d: *Diagnostics, name: []const u8, to: Kind) !void {
inline for (std.meta.fields(Options)) |f| {
inline for (@typeInfo(Options).Struct.fields) |f| {
if (mem.eql(u8, f.name, name)) {
@field(d.options, f.name) = to;
return;
Expand Down
4 changes: 2 additions & 2 deletions src/aro/features.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ pub fn hasFeature(comp: *Compilation, ext: []const u8) bool {
.c_static_assert = comp.langopts.standard.atLeast(.c11),
.c_thread_local = comp.langopts.standard.atLeast(.c11) and target_util.isTlsSupported(comp.target),
};
inline for (std.meta.fields(@TypeOf(list))) |f| {
inline for (@typeInfo(@TypeOf(list)).Struct.fields) |f| {
if (std.mem.eql(u8, f.name, ext)) return @field(list, f.name);
}
return false;
Expand All @@ -69,7 +69,7 @@ pub fn hasExtension(comp: *Compilation, ext: []const u8) bool {
.matrix_types = false, // TODO
.matrix_types_scalar_division = false, // TODO
};
inline for (std.meta.fields(@TypeOf(list))) |f| {
inline for (@typeInfo(@TypeOf(list)).Struct.fields) |f| {
if (std.mem.eql(u8, f.name, ext)) return @field(list, f.name);
}
return false;
Expand Down

0 comments on commit fa822b7

Please sign in to comment.