Migrate to Zig v0.10.0

5 files changed, 15 insertions, 11 deletions

diff --git a/src/bun.js/bindings/exports.zig b/src/bun.js/bindings/exports.zig
index aff961154..98b384ec3 100644
--- a/src/bun.js/bindings/exports.zig
+++ b/src/bun.js/bindings/exports.zig
@@ -29,6 +29,8 @@ const JSPrivateDataPtr = @import("../base.zig").JSPrivateDataPtr;
 const Backtrace = @import("../../deps/backtrace.zig");
 const JSPrinter = @import("../../js_printer.zig");
 const JSLexer = @import("../../js_lexer.zig");
+const typeBaseName = @import("../../meta.zig").typeBaseName;
+
 pub const ZigGlobalObject = extern struct {
     pub const shim = Shimmer("Zig", "GlobalObject", @This());
     bytes: shim.Bytes,
@@ -40,7 +42,7 @@ pub const ZigGlobalObject = extern struct {
 
     pub fn create(class_ref: [*]CAPI.JSClassRef, count: i32, console: *anyopaque) *JSGlobalObject {
         var global = shim.cppFn("create", .{ class_ref, count, console });
-        Backtrace.reloadHandlers();
+        Backtrace.reloadHandlers() catch unreachable;
         return global;
     }
 
@@ -194,7 +196,7 @@ pub fn Errorable(comptime Type: type) type {
     return extern struct {
         result: Result,
         success: bool,
-        pub const name = "Errorable" ++ @typeName(Type);
+        pub const name = "Errorable" ++ typeBaseName(@typeName(Type));
 
         pub const Result = extern union {
             value: Type,
diff --git a/src/bun.js/bindings/header-gen.zig b/src/bun.js/bindings/header-gen.zig
index c11241233..ab93fad47 100644
--- a/src/bun.js/bindings/header-gen.zig
+++ b/src/bun.js/bindings/header-gen.zig
@@ -7,6 +7,7 @@ const EnumMeta = std.builtin.TypeInfo.Enum;
 const UnionMeta = std.builtin.TypeInfo.Union;
 const warn = std.debug.warn;
 const StaticExport = @import("./static_export.zig");
+const typeBaseName = @import("../../meta.zig").typeBaseName;
 
 const TypeNameMap = std.StringHashMap([]const u8);
 
@@ -156,7 +157,7 @@ pub const C_Generator = struct {
 
                     switch (@typeInfo(ArgType)) {
                         .Enum => {
-                            self.write(comptime std.fmt.comptimePrint(" {s}{d}", .{ @typeName(ArgType), i }));
+                            self.write(comptime std.fmt.comptimePrint(" {s}{d}", .{ typeBaseName(@typeName(ArgType)), i }));
                         },
 
                         else => {
@@ -202,7 +203,7 @@ pub const C_Generator = struct {
             // } else {
             const ArgType = arg.arg_type.?;
             if (@typeInfo(ArgType) == .Enum) {
-                self.write(comptime std.fmt.comptimePrint(" {s}{d}", .{ @typeName(ArgType), i }));
+                self.write(comptime std.fmt.comptimePrint(" {s}{d}", .{ typeBaseName(@typeName(ArgType)), i }));
             } else {
                 self.write(comptime std.fmt.comptimePrint(" arg{d}", .{i}));
             }
@@ -419,7 +420,7 @@ pub const C_Generator = struct {
                     self.writeType(Enum.tag_type);
                 },
                 else => {
-                    return self.write(@typeName(T));
+                    return self.write(comptime typeBaseName(@typeName(T)));
                 },
             }
         }
@@ -472,7 +473,7 @@ pub fn getCStruct(comptime T: type) ?NamedStruct {
         if (std.mem.eql(u8, decl.name, "Type")) {
             switch (decl.data) {
                 .Type => {
-                    return NamedStruct{ .Type = T, .name = @typeName(T) };
+                    return NamedStruct{ .Type = T, .name = comptime typeBaseName(@typeName(T)) };
                 },
                 else => {},
             }
diff --git a/src/bun.js/bindings/headers-cpp.h b/src/bun.js/bindings/headers-cpp.h
index b7bb32042..a299530c3 100644
--- a/src/bun.js/bindings/headers-cpp.h
+++ b/src/bun.js/bindings/headers-cpp.h
@@ -1,4 +1,4 @@
-//-- AUTOGENERATED FILE -- 1656747036
+//-- AUTOGENERATED FILE -- 1657353886
 // clang-format off
 #pragma once
 
diff --git a/src/bun.js/bindings/headers.h b/src/bun.js/bindings/headers.h
index 1877339b1..091a75896 100644
--- a/src/bun.js/bindings/headers.h
+++ b/src/bun.js/bindings/headers.h
@@ -1,5 +1,5 @@
 // clang-format off
-//-- AUTOGENERATED FILE -- 1656747036
+//-- AUTOGENERATED FILE -- 1657353886
 #pragma once
 
 #include <stddef.h>
diff --git a/src/bun.js/event_loop.zig b/src/bun.js/event_loop.zig
index df6af2748..f5ed49eb7 100644
--- a/src/bun.js/event_loop.zig
+++ b/src/bun.js/event_loop.zig
@@ -10,6 +10,7 @@ const Fetch = JSC.WebCore.Fetch;
 const WebCore = JSC.WebCore;
 const Bun = JSC.API.Bun;
 const TaggedPointerUnion = @import("../tagged_pointer.zig").TaggedPointerUnion;
+const typeBaseName = @import("../meta.zig").typeBaseName;
 const CopyFilePromiseTask = WebCore.Blob.Store.CopyFile.CopyFilePromiseTask;
 const AsyncTransformTask = @import("./api/transpiler.zig").TransformTask.AsyncTransformTask;
 const BunTimerTimeoutTask = Bun.Timer.Timeout.TimeoutTask;
@@ -335,7 +336,7 @@ pub const EventLoop = struct {
                     finished += 1;
                     vm_.active_tasks -|= 1;
                 },
-                @field(Task.Tag, @typeName(JSC.napi.napi_async_work)) => {
+                @field(Task.Tag, typeBaseName(@typeName(JSC.napi.napi_async_work))) => {
                     var transform_task: *JSC.napi.napi_async_work = task.get(JSC.napi.napi_async_work).?;
                     transform_task.*.runFromJS();
                     finished += 1;
@@ -361,13 +362,13 @@ pub const EventLoop = struct {
                     finished += 1;
                     vm_.active_tasks -|= 1;
                 },
-                @field(Task.Tag, @typeName(AnyTask)) => {
+                @field(Task.Tag, typeBaseName(@typeName(AnyTask))) => {
                     var any: *AnyTask = task.get(AnyTask).?;
                     any.run();
                     finished += 1;
                     vm_.active_tasks -|= 1;
                 },
-                @field(Task.Tag, @typeName(CppTask)) => {
+                @field(Task.Tag, typeBaseName(@typeName(CppTask))) => {
                     var any: *CppTask = task.get(CppTask).?;
                     any.run(global);
                     finished += 1;