Commit 94485b2a58f8efbfb61e46d2efa257420f12a22d | zig

author	daurnimator <quae@daurnimator.com> 2019-11-23 13:13:47+11:00
committer	daurnimator <quae@daurnimator.com> 2019-11-25 09:26:33+11:00
log	94485b2a58f8efbfb61e46d2efa257420f12a22d
tree	7f92c6a69dbf67355da63ce47b6d488dd6e57d74
parent	b4091e3aec1e13350983f8f8df31280b285fe111
signature	Commit is signed but in an unrecognized format.

1 files changed, 5 insertions(+), 8 deletions(-)

lib/std/fifo.zig+5-8

 @@ -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;
+                const end = math.min(self.head + self.count, self.buf.len);
-                if (end >= self.buf.len) {
+                return self.buf[start..end];
-                    return self.buf[start..self.buf.len];
-                } else {
-                    return self.buf[start..end];
-                }
             }
         }