aboutsummaryrefslogtreecommitdiff
path: root/src/bun.js
diff options
context:
space:
mode:
authorGravatar Alex Lam S.L <alexlamsl@gmail.com> 2023-02-24 15:53:26 +0200
committerGravatar GitHub <noreply@github.com> 2023-02-24 05:53:26 -0800
commite887a064fb63347b4a4b21c282c1db01dfee98b1 (patch)
tree6270a7ce5527ea06d709d4b92e14623518e0f5b5 /src/bun.js
parent6e4908e51793d82d3b6924b2ede9a02f1e95bf37 (diff)
downloadbun-e887a064fb63347b4a4b21c282c1db01dfee98b1.tar.gz
bun-e887a064fb63347b4a4b21c282c1db01dfee98b1.tar.zst
bun-e887a064fb63347b4a4b21c282c1db01dfee98b1.zip
prefer `bun.copy()` over `std.mem.copy()` (#2152)
Diffstat (limited to 'src/bun.js')
-rw-r--r--src/bun.js/bindings/bindings.zig2
-rw-r--r--src/bun.js/bindings/exports.zig2
-rw-r--r--src/bun.js/node/buffer.zig4
-rw-r--r--src/bun.js/webcore.zig2
-rw-r--r--src/bun.js/webcore/response.zig32
5 files changed, 15 insertions, 27 deletions
diff --git a/src/bun.js/bindings/bindings.zig b/src/bun.js/bindings/bindings.zig
index 05684902b..54d54f644 100644
--- a/src/bun.js/bindings/bindings.zig
+++ b/src/bun.js/bindings/bindings.zig
@@ -391,7 +391,7 @@ pub const ZigString = extern struct {
return "";
}
- std.mem.copy(u8, buf[0..this.len], this.slice());
+ bun.copy(u8, buf, this.slice());
buf[this.len] = 0;
return bun.cstring(buf[0..this.len]);
}
diff --git a/src/bun.js/bindings/exports.zig b/src/bun.js/bindings/exports.zig
index c87a80571..f9a9a3467 100644
--- a/src/bun.js/bindings/exports.zig
+++ b/src/bun.js/bindings/exports.zig
@@ -466,7 +466,7 @@ pub const ZigStackTrace = extern struct {
var remain_buf = source_line_buf[0..];
var i: usize = 0;
while (source_lines_iter.next()) |source| {
- std.mem.copy(u8, remain_buf, source.text);
+ bun.copy(u8, remain_buf, source.text);
const copied_line = remain_buf[0..source.text.len];
remain_buf = remain_buf[source.text.len..];
source_lines[i] = .{ .text = copied_line, .line = source.line };
diff --git a/src/bun.js/node/buffer.zig b/src/bun.js/node/buffer.zig
index 8ede45f5d..5a7d64955 100644
--- a/src/bun.js/node/buffer.zig
+++ b/src/bun.js/node/buffer.zig
@@ -78,7 +78,7 @@ pub const BufferVectorized = struct {
const minimum_contents = contents;
while (buf.len >= contents.len) {
const min_len = @min(contents.len, buf.len);
- std.mem.copy(u8, buf[0..min_len], contents[0..min_len]);
+ bun.copy(u8, buf, contents[0..min_len]);
if (buf.len <= contents.len) {
break;
}
@@ -88,7 +88,7 @@ pub const BufferVectorized = struct {
while (buf.len > 0) {
const to_fill = @min(minimum_contents.len, buf.len);
- std.mem.copy(u8, buf[0..to_fill], minimum_contents[0..to_fill]);
+ bun.copy(u8, buf, minimum_contents[0..to_fill]);
buf = buf[to_fill..];
}
}
diff --git a/src/bun.js/webcore.zig b/src/bun.js/webcore.zig
index 4478337b5..ebb81f928 100644
--- a/src/bun.js/webcore.zig
+++ b/src/bun.js/webcore.zig
@@ -675,7 +675,7 @@ pub const Crypto = struct {
0 => {},
// 512 bytes or less we reuse from the same cache as UUID generation.
1...JSC.RareData.EntropyCache.size / 8 => {
- std.mem.copy(u8, slice, globalThis.bunVM().rareData().entropySlice(slice.len));
+ bun.copy(u8, slice, globalThis.bunVM().rareData().entropySlice(slice.len));
},
else => {
bun.rand(slice);
diff --git a/src/bun.js/webcore/response.zig b/src/bun.js/webcore/response.zig
index 7ba7198c7..58a1dcac8 100644
--- a/src/bun.js/webcore/response.zig
+++ b/src/bun.js/webcore/response.zig
@@ -1026,21 +1026,15 @@ pub const Fetch = struct {
url = ZigURL.parse(getAllocator(ctx).dupe(u8, request.url) catch unreachable);
url_proxy_buffer = url.href;
} else {
- var total_len = request.url.len + proxy_url_zig.len;
-
- const allocator = getAllocator(ctx);
-
- var buffer = allocator.alloc(u8, total_len) catch {
+ var buffer = getAllocator(ctx).alloc(u8, request.url.len + proxy_url_zig.len) catch {
JSC.JSError(bun.default_allocator, "Out of memory", .{}, ctx, exception);
return null;
};
+ @memcpy(buffer.ptr, request.url.ptr, request.url.len);
+ var proxy_url_slice = buffer[request.url.len..];
+ @memcpy(proxy_url_slice.ptr, proxy_url_zig.ptr, proxy_url_zig.len);
- var url_slice = buffer[0..request.url.len];
- std.mem.copy(u8, url_slice, request.url);
- var proxy_url_slice = buffer[request.url.len..buffer.len];
- std.mem.copy(u8, proxy_url_slice, proxy_url_zig.ptr[0..proxy_url_zig.len]);
-
- url = ZigURL.parse(url_slice);
+ url = ZigURL.parse(buffer[0..request.url.len]);
proxy = ZigURL.parse(proxy_url_slice);
url_proxy_buffer = buffer;
}
@@ -1167,21 +1161,15 @@ pub const Fetch = struct {
url = ZigURL.parse(url_slice.slice());
url_proxy_buffer = url.href;
} else {
- const allocator = getAllocator(ctx);
-
- var total_len = url_zig.len + proxy_url_zig.len;
- var buffer = allocator.alloc(u8, total_len) catch {
+ var buffer = getAllocator(ctx).alloc(u8, url_zig.len + proxy_url_zig.len) catch {
JSC.JSError(bun.default_allocator, "Out of memory", .{}, ctx, exception);
return null;
};
+ @memcpy(buffer.ptr, url_zig.ptr, url_zig.len);
+ var proxy_url_slice = buffer[url_zig.len..];
+ @memcpy(proxy_url_slice.ptr, proxy_url_zig.ptr, proxy_url_zig.len);
- var url_slice = buffer[0..url_zig.len];
-
- std.mem.copy(u8, url_slice, url_zig.ptr[0..url_zig.len]);
- var proxy_url_slice = buffer[url_zig.len..buffer.len];
- std.mem.copy(u8, proxy_url_slice, proxy_url_zig.ptr[0..proxy_url_zig.len]);
-
- url = ZigURL.parse(url_slice);
+ url = ZigURL.parse(buffer[0..url_zig.len]);
proxy = ZigURL.parse(proxy_url_slice);
url_proxy_buffer = buffer;
}