From f993975ae6e94e367f30f66ddba9c69a693f8aa4 Mon Sep 17 00:00:00 2001 From: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> Date: Thu, 19 Jan 2023 21:00:53 -0800 Subject: make this code easier to read --- src/bun.js/node/types.zig | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) (limited to 'src/bun.js/node') diff --git a/src/bun.js/node/types.zig b/src/bun.js/node/types.zig index 33f6492e7..d25023eb4 100644 --- a/src/bun.js/node/types.zig +++ b/src/bun.js/node/types.zig @@ -417,35 +417,7 @@ pub const SliceOrBuffer = union(Tag) { return fromJS(global, allocator, value); } - const out = brk: { - if (!zig_str.is16Bit()) { - const buf = zig_str.slice(); - break :brk switch (encoding) { - Encoding.utf8 => JSC.WebCore.Encoder.constructFromU8(buf.ptr, buf.len, .utf8), - Encoding.ucs2 => JSC.WebCore.Encoder.constructFromU8(buf.ptr, buf.len, .ucs2), - Encoding.utf16le => JSC.WebCore.Encoder.constructFromU8(buf.ptr, buf.len, .utf16le), - Encoding.latin1 => JSC.WebCore.Encoder.constructFromU8(buf.ptr, buf.len, .latin1), - Encoding.ascii => JSC.WebCore.Encoder.constructFromU8(buf.ptr, buf.len, .ascii), - Encoding.base64 => JSC.WebCore.Encoder.constructFromU8(buf.ptr, buf.len, .base64), - Encoding.hex => JSC.WebCore.Encoder.constructFromU8(buf.ptr, buf.len, .hex), - Encoding.buffer => JSC.WebCore.Encoder.constructFromU8(buf.ptr, buf.len, .buffer), - Encoding.base64url => JSC.WebCore.Encoder.constructFromU8(buf.ptr, buf.len, .base64url), - }; - } else { - const buf = zig_str.utf16SliceAligned(); - break :brk switch (encoding) { - Encoding.utf8 => JSC.WebCore.Encoder.constructFromU16(buf.ptr, buf.len, .utf8), - Encoding.ucs2 => JSC.WebCore.Encoder.constructFromU16(buf.ptr, buf.len, .ucs2), - Encoding.utf16le => JSC.WebCore.Encoder.constructFromU16(buf.ptr, buf.len, .utf16le), - Encoding.latin1 => JSC.WebCore.Encoder.constructFromU16(buf.ptr, buf.len, .latin1), - Encoding.ascii => JSC.WebCore.Encoder.constructFromU16(buf.ptr, buf.len, .ascii), - Encoding.base64 => JSC.WebCore.Encoder.constructFromU16(buf.ptr, buf.len, .base64), - Encoding.hex => JSC.WebCore.Encoder.constructFromU16(buf.ptr, buf.len, .hex), - Encoding.buffer => JSC.WebCore.Encoder.constructFromU16(buf.ptr, buf.len, .buffer), - Encoding.base64url => JSC.WebCore.Encoder.constructFromU16(buf.ptr, buf.len, .base64url), - }; - } - }; + const out = zig_str.encode(encoding); return .{ .string = JSC.ZigString.Slice.from(out, allocator) }; } -- cgit v1.2.3