From bc2f7c7547dce95dfd1aa00e377ae9f366825177 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Mon, 12 May 2025 18:53:57 +0200 Subject: [PATCH] Revert "Work around stage1 not yet returning null-terminated `@typeInfo` strings" This reverts commit c8fa767f083e610840cef688b709783c5ad66acc. --- lib/std/enums.zig | 2 +- lib/std/io.zig | 2 +- lib/std/meta.zig | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/std/enums.zig b/lib/std/enums.zig index 819bb76434..e34cf17e07 100644 --- a/lib/std/enums.zig +++ b/lib/std/enums.zig @@ -36,7 +36,7 @@ pub fn EnumFieldStruct(comptime E: type, comptime Data: type, comptime field_def var struct_fields: [@typeInfo(E).@"enum".fields.len]std.builtin.Type.StructField = undefined; for (&struct_fields, @typeInfo(E).@"enum".fields) |*struct_field, enum_field| { struct_field.* = .{ - .name = enum_field.name ++ "", + .name = enum_field.name, .type = Data, .default_value_ptr = if (field_default) |d| @as(?*const anyopaque, @ptrCast(&d)) else null, .is_comptime = false, diff --git a/lib/std/io.zig b/lib/std/io.zig index c70a0086c1..597b8d5ec1 100644 --- a/lib/std/io.zig +++ b/lib/std/io.zig @@ -803,7 +803,7 @@ pub fn PollFiles(comptime StreamEnum: type) type { var struct_fields: [enum_fields.len]std.builtin.Type.StructField = undefined; for (&struct_fields, enum_fields) |*struct_field, enum_field| { struct_field.* = .{ - .name = enum_field.name ++ "", + .name = enum_field.name, .type = fs.File, .default_value_ptr = null, .is_comptime = false, diff --git a/lib/std/meta.zig b/lib/std/meta.zig index 5707527aed..5a4ec517b0 100644 --- a/lib/std/meta.zig +++ b/lib/std/meta.zig @@ -537,7 +537,7 @@ pub fn FieldEnum(comptime T: type) type { var decls = [_]std.builtin.Type.Declaration{}; inline for (field_infos, 0..) |field, i| { enumFields[i] = .{ - .name = field.name ++ "", + .name = field.name, .value = i, }; } @@ -609,7 +609,7 @@ pub fn DeclEnum(comptime T: type) type { var enumDecls: [fieldInfos.len]std.builtin.Type.EnumField = undefined; var decls = [_]std.builtin.Type.Declaration{}; inline for (fieldInfos, 0..) |field, i| { - enumDecls[i] = .{ .name = field.name ++ "", .value = i }; + enumDecls[i] = .{ .name = field.name, .value = i }; } return @Type(.{ .@"enum" = .{