Skip to content

Commit c8fa767

Browse files
committed
Work around stage1 not yet returning null-terminated @typeInfo strings
These changes can be reverted the next time stage1 is updated.
1 parent a02bd81 commit c8fa767

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

deps/aro/aro/Attribute.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ pub const Arguments = blk: {
645645
var union_fields: [decls.len]ZigType.UnionField = undefined;
646646
for (decls, &union_fields) |decl, *field| {
647647
field.* = .{
648-
.name = decl.name,
648+
.name = decl.name ++ "",
649649
.type = @field(attributes, decl.name),
650650
.alignment = 0,
651651
};

lib/std/enums.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub fn EnumFieldStruct(comptime E: type, comptime Data: type, comptime field_def
1414
var fields: []const StructField = &[_]StructField{};
1515
for (std.meta.fields(E)) |field| {
1616
fields = fields ++ &[_]StructField{.{
17-
.name = field.name,
17+
.name = field.name ++ "",
1818
.type = Data,
1919
.default_value = if (field_default) |d| @as(?*const anyopaque, @ptrCast(&d)) else null,
2020
.is_comptime = false,

lib/std/io.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ pub fn PollFiles(comptime StreamEnum: type) type {
635635
var struct_fields: [enum_fields.len]std.builtin.Type.StructField = undefined;
636636
for (&struct_fields, enum_fields) |*struct_field, enum_field| {
637637
struct_field.* = .{
638-
.name = enum_field.name,
638+
.name = enum_field.name ++ "",
639639
.type = fs.File,
640640
.default_value = null,
641641
.is_comptime = false,

lib/std/meta.zig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ pub fn FieldEnum(comptime T: type) type {
556556
var decls = [_]std.builtin.Type.Declaration{};
557557
inline for (field_infos, 0..) |field, i| {
558558
enumFields[i] = .{
559-
.name = field.name,
559+
.name = field.name ++ "",
560560
.value = i,
561561
};
562562
}
@@ -628,7 +628,7 @@ pub fn DeclEnum(comptime T: type) type {
628628
var enumDecls: [fieldInfos.len]std.builtin.Type.EnumField = undefined;
629629
var decls = [_]std.builtin.Type.Declaration{};
630630
inline for (fieldInfos, 0..) |field, i| {
631-
enumDecls[i] = .{ .name = field.name, .value = i };
631+
enumDecls[i] = .{ .name = field.name ++ "", .value = i };
632632
}
633633
return @Type(.{
634634
.Enum = .{

src/value.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4050,7 +4050,7 @@ pub const Value = struct {
40504050
const tags = @typeInfo(Tag).Enum.fields;
40514051
var fields: [tags.len]std.builtin.Type.StructField = undefined;
40524052
for (&fields, tags) |*field, t| field.* = .{
4053-
.name = t.name,
4053+
.name = t.name ++ "",
40544054
.type = *@field(Tag, t.name).Type(),
40554055
.default_value = null,
40564056
.is_comptime = false,

0 commit comments

Comments
 (0)