zig

commit 94485b2a58f8efbfb61e46d2efa257420f12a22d (tree)
parent b4091e3aec1e13350983f8f8df31280b285fe111
Author: daurnimator <quae@daurnimator.com>
Date:   Sat, 23 Nov 2019 13:13:47 +1100

std: clean up fifo.readableSliceMut

Diffstat:
M
lib/std/fifo.zig
 | 
13
+++++--------

1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/lib/std/fifo.zig b/lib/std/fifo.zig
@@ -145,16 +145,13 @@ pub fn LinearFifo(
         fn readableSliceMut(self: SliceSelfArg, offset: usize) []T {
             if (offset > self.count) return [_]T{};
 
-            const start = self.head + offset;
+            var start = self.head + offset;
             if (start >= self.buf.len) {
-                return self.buf[start - self.buf.len ..][0 .. self.count - offset];
+                start -= self.buf.len;
+                return self.buf[start..self.count - offset];
             } else {
-                const end: usize = self.head + self.count;
-                if (end >= self.buf.len) {
-                    return self.buf[start..self.buf.len];
-                } else {
-                    return self.buf[start..end];
-                }
+                const end = math.min(self.head + self.count, self.buf.len);
+                return self.buf[start..end];
             }
         }