aboutsummaryrefslogtreecommitdiff
path: root/src/linear_fifo.zig
diff options
context:
space:
mode:
authorGravatar Dylan Conway <35280289+dylan-conway@users.noreply.github.com> 2023-06-21 23:38:18 -0700
committerGravatar GitHub <noreply@github.com> 2023-06-21 23:38:18 -0700
commit5fa13625a1ca0ea1a3a1c5bb86d0880dcfac349f (patch)
tree97f669a178e60772038751d690c3e298a63557b2 /src/linear_fifo.zig
parentbfb322d618a3f0e9618d311ae69016fe7a08e771 (diff)
downloadbun-5fa13625a1ca0ea1a3a1c5bb86d0880dcfac349f.tar.gz
bun-5fa13625a1ca0ea1a3a1c5bb86d0880dcfac349f.tar.zst
bun-5fa13625a1ca0ea1a3a1c5bb86d0880dcfac349f.zip
upgrade zig to `v0.11.0-dev.3737+9eb008717` (#3374)
* progress * finish `@memset/@memcpy` update * Update build.zig * change `@enumToInt` to `@intFromEnum` and friends * update zig versions * it was 1 * add link to issue * add `compileError` reminder * fix merge * format * upgrade to llvm 16 * Revert "upgrade to llvm 16" This reverts commit cc930ceb1c5b4db9614a7638596948f704544ab8. --------- Co-authored-by: Jarred Sumner <jarred@jarredsumner.com> Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
Diffstat (limited to 'src/linear_fifo.zig')
-rw-r--r--src/linear_fifo.zig18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/linear_fifo.zig b/src/linear_fifo.zig
index 66d579fdc..b73f21ce9 100644
--- a/src/linear_fifo.zig
+++ b/src/linear_fifo.zig
@@ -100,7 +100,7 @@ pub fn LinearFifo(
var tmp: [mem.page_size / 2 / @sizeOf(T)]T = undefined;
while (self.head != 0) {
- const n = math.min(self.head, tmp.len);
+ const n = @min(self.head, tmp.len);
const m = self.buf.len - n;
bun.copy(T, tmp[0..n], self.buf[0..n]);
// this middle copy overlaps; the others here don't
@@ -111,7 +111,7 @@ pub fn LinearFifo(
}
{ // set unused area to undefined
const unused = mem.sliceAsBytes(self.buf[self.count..]);
- @memset(unused.ptr, undefined, unused.len);
+ @memset(unused, undefined);
}
}
@@ -137,7 +137,7 @@ pub fn LinearFifo(
if (self.count > 0) {
var new_bytes = std.mem.sliceAsBytes(buf);
var old_bytes = std.mem.sliceAsBytes(self.readableSlice(0));
- @memcpy(new_bytes.ptr, old_bytes.ptr, old_bytes.len);
+ @memcpy(new_bytes[0..old_bytes.len], old_bytes);
self.allocator.free(self.buf);
}
self.head = 0;
@@ -168,7 +168,7 @@ pub fn LinearFifo(
start -= self.buf.len;
return self.buf[start .. start + (self.count - offset)];
} else {
- const end = math.min(self.head + self.count, self.buf.len);
+ const end = @min(self.head + self.count, self.buf.len);
return self.buf[start..end];
}
}
@@ -187,12 +187,12 @@ pub fn LinearFifo(
const slice = self.readableSliceMut(0);
if (slice.len >= count) {
const unused = mem.sliceAsBytes(slice[0..count]);
- @memset(unused.ptr, undefined, unused.len);
+ @memset(unused, undefined);
} else {
const unused = mem.sliceAsBytes(slice[0..]);
- @memset(unused.ptr, undefined, unused.len);
+ @memset(unused, undefined);
const unused2 = mem.sliceAsBytes(self.readableSliceMut(slice.len)[0 .. count - slice.len]);
- @memset(unused2.ptr, undefined, unused2.len);
+ @memset(unused2, undefined);
}
}
@@ -224,7 +224,7 @@ pub fn LinearFifo(
while (dst_left.len > 0) {
const slice = self.readableSlice(0);
if (slice.len == 0) break;
- const n = math.min(slice.len, dst_left.len);
+ const n = @min(slice.len, dst_left.len);
bun.copy(T, dst_left, slice[0..n]);
self.discard(n);
dst_left = dst_left[n..];
@@ -293,7 +293,7 @@ pub fn LinearFifo(
while (src_left.len > 0) {
const writable_slice = self.writableSlice(0);
assert(writable_slice.len != 0);
- const n = math.min(writable_slice.len, src_left.len);
+ const n = @min(writable_slice.len, src_left.len);
bun.copy(T, writable_slice, src_left[0..n]);
self.update(n);
src_left = src_left[n..];