diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2023-04-29 00:19:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-29 00:19:55 -0700 |
| commit | d65b42e07caa00dfe2f2fbf221c593ce57882784 (patch) | |
| tree | 7926cbea1499e0affe930bf6d7455dc24adf014e /lib/std/io/buffered_reader.zig | |
| parent | fd6200eda6d4fe19c34a59430a88a9ce38d6d7a4 (diff) | |
| parent | fa200ca0cad2705bad40eb723dedf4e3bf11f2ff (diff) | |
| download | zig-d65b42e07caa00dfe2f2fbf221c593ce57882784.tar.gz zig-d65b42e07caa00dfe2f2fbf221c593ce57882784.zip | |
Merge pull request #15481 from ziglang/use-mem-intrinsics
actually use the new memory intrinsics
Diffstat (limited to 'lib/std/io/buffered_reader.zig')
| -rw-r--r-- | lib/std/io/buffered_reader.zig | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/std/io/buffered_reader.zig b/lib/std/io/buffered_reader.zig index 2f6677c6a5..efc1d78cc4 100644 --- a/lib/std/io/buffered_reader.zig +++ b/lib/std/io/buffered_reader.zig @@ -20,8 +20,8 @@ pub fn BufferedReader(comptime buffer_size: usize, comptime ReaderType: type) ty var dest_index: usize = 0; while (dest_index < dest.len) { - const written = std.math.min(dest.len - dest_index, self.end - self.start); - std.mem.copy(u8, dest[dest_index..], self.buf[self.start .. self.start + written]); + const written = @min(dest.len - dest_index, self.end - self.start); + @memcpy(dest[dest_index..][0..written], self.buf[self.start..][0..written]); if (written == 0) { // buf empty, fill it const n = try self.unbuffered_reader.read(self.buf[0..]); @@ -115,11 +115,8 @@ test "io.BufferedReader Block" { } fn read(self: *Self, dest: []u8) Error!usize { - if (self.curr_read >= self.reads_allowed) { - return 0; - } - std.debug.assert(dest.len >= self.block.len); - std.mem.copy(u8, dest, self.block); + if (self.curr_read >= self.reads_allowed) return 0; + @memcpy(dest[0..self.block.len], self.block); self.curr_read += 1; return self.block.len; |
