use wrapper

2 files changed, 13 insertions, 17 deletions

diff --git a/src/bun.js/bindings/bindings.zig b/src/bun.js/bindings/bindings.zig
index fa7efa728..23dd6188f 100644
--- a/src/bun.js/bindings/bindings.zig
+++ b/src/bun.js/bindings/bindings.zig
@@ -368,7 +368,7 @@ pub const ZigString = extern struct {
         }
 
         pub fn sliceZ(this: Slice) [:0]const u8 {
-            return this.ptr[0..this.len :0];
+            return bun.cstring(this.ptr[0..this.len]);
         }
 
         pub fn toSliceZ(this: Slice, buf: []u8) [:0]const u8 {
@@ -386,7 +386,7 @@ pub const ZigString = extern struct {
 
             std.mem.copy(u8, buf[0..this.len], this.slice());
             buf[this.len] = 0;
-            return buf[0..this.len :0];
+            return bun.cstring(buf[0..this.len]);
         }
 
         pub fn mut(this: Slice) []u8 {
diff --git a/src/bun.zig b/src/bun.zig
index d555b23d1..c70e7655e 100644
--- a/src/bun.zig
+++ b/src/bun.zig
@@ -747,18 +747,17 @@ pub const bit_set = @import("./install/bit_set.zig");
 
 pub fn enumMap(comptime T: type, comptime args: anytype) (fn (T) []const u8) {
     const Map = struct {
-        pub fn get(input: T) []const u8 {
-            // https://github.com/ziglang/zig/issues/14145
-            // https://github.com/ziglang/zig/issues/12765
-            const labels = comptime brk: {
-                var vabels_ = std.enums.EnumArray(T, []const u8).initFill("");
-                @setEvalBranchQuota(99999);
-                inline for (args) |field| {
-                    vabels_.set(field.@"0", field.@"1");
-                }
-                break :brk vabels_;
-            };
+        const vargs = args;
+        const labels = brk: {
+            var vabels_ = std.enums.EnumArray(T, []const u8).initFill("");
+            @setEvalBranchQuota(99999);
+            inline for (vargs) |field| {
+                vabels_.set(field.@"0", field.@"1");
+            }
+            break :brk vabels_;
+        };
 
+        pub fn get(input: T) []const u8 {
             return labels.get(input);
         }
     };
@@ -940,10 +939,7 @@ pub fn cstring(input: []const u8) [:0]const u8 {
 
     if (comptime Environment.allow_assert) {
         std.debug.assert(
-            lenSliceTo(
-                @ptrCast([*:0]const u8, input.ptr),
-                0,
-            ) == input.len,
+            input.ptr[input.len] == 0,
         );
     }
     return @ptrCast([*:0]const u8, input.ptr)[0..input.len :0];