@zigc/lib 0.15.0-dev.0 → 0.15.1

package/libc/netbsd/lib/csu/common/crtbegin.c

@@ -0,0 +1,135 @@
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: crtbegin.c,v 1.17 2018/12/28 18:17:11 christos Exp $");
+
+/* zig patch: no crtbegin.h */
+
+typedef void (*fptr_t)(void);
+
+/* zig patch: remove gcj nonsense */
+
+#if !defined(HAVE_INITFINI_ARRAY)
+extern __dso_hidden const fptr_t __CTOR_LIST__start __asm("__CTOR_LIST__");
+
+__dso_hidden const fptr_t __aligned(sizeof(void *)) __CTOR_LIST__[] __section(".ctors") = {
+	(fptr_t) -1,
+};
+__dso_hidden extern const fptr_t __CTOR_LIST_END__[];
+#endif
+
+#ifdef SHARED
+__dso_hidden void *__dso_handle = &__dso_handle;
+
+__weakref_visible void cxa_finalize(void *)
+	__weak_reference(__cxa_finalize);
+#else
+__dso_hidden void *__dso_handle;
+#endif
+
+#if !defined(__ARM_EABI__) || defined(__ARM_DWARF_EH__)
+__dso_hidden const long __EH_FRAME_LIST__[0] __section(".eh_frame");
+
+__weakref_visible void register_frame_info(const void *, const void *)
+	__weak_reference(__register_frame_info);
+__weakref_visible void deregister_frame_info(const void *)
+	__weak_reference(__deregister_frame_info);
+
+static long dwarf_eh_object[8];
+#endif
+
+static void __do_global_ctors_aux(void) __used;
+
+/* zig patch: use .init_array */
+__attribute__((constructor))
+static void
+__do_global_ctors_aux(void)
+{
+	static unsigned char __initialized;
+
+	if (__initialized)
+		return;
+
+	__initialized = 1;
+
+#if !defined(__ARM_EABI__) || defined(__ARM_DWARF_EH__)
+	if (register_frame_info)
+		register_frame_info(__EH_FRAME_LIST__, &dwarf_eh_object);
+#endif
+
+    /* zig patch: remove gcj nonsense */
+
+#if !defined(HAVE_INITFINI_ARRAY)
+	for (const fptr_t *p = __CTOR_LIST_END__; p > &__CTOR_LIST__start + 1; ) {
+		(*(*--p))();
+	}
+#endif
+}
+
+#if !defined(__ARM_EABI__) || defined(SHARED) || defined(__ARM_DWARF_EH__)
+#if !defined(HAVE_INITFINI_ARRAY)
+extern __dso_hidden const fptr_t __DTOR_LIST__start __asm("__DTOR_LIST__");
+
+__dso_hidden const fptr_t __aligned(sizeof(void *)) __DTOR_LIST__[] __section(".dtors") = {
+	(fptr_t) -1,
+};
+__dso_hidden extern const fptr_t __DTOR_LIST_END__[];
+#endif
+
+static void __do_global_dtors_aux(void) __used;
+
+/* zig patch: use .fini_array */
+__attribute__((destructor))
+static void
+__do_global_dtors_aux(void)
+{
+	static unsigned char __finished;
+
+	if (__finished)
+		return;
+
+	__finished = 1;
+
+#ifdef SHARED
+	if (cxa_finalize)
+		(*cxa_finalize)(__dso_handle);
+#endif
+
+#if !defined(HAVE_INITFINI_ARRAY)
+	for (const fptr_t *p = &__DTOR_LIST__start + 1; p < __DTOR_LIST_END__; ) {
+		(*(*p++))();
+	}
+#endif
+
+#if !defined(__ARM_EABI__) || defined(__ARM_DWARF_EH__)
+	if (deregister_frame_info)
+		deregister_frame_info(__EH_FRAME_LIST__);
+#endif
+}
+#endif /* !__ARM_EABI__ || SHARED || __ARM_DWARF_EH__ */

package/libc/netbsd/lib/csu/common/csu-common.h

@@ -0,0 +1,38 @@
+/*-
+ * Copyright (c) 2021 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * For historical reasons the following symbols are defined both in libc
+ * and csu and need to be common
+ */
+#if __has_attribute(__common__)
+#define	__common	__attribute((__common__))
+#else
+#define	__common
+#endif
+extern char *__progname __common;
+extern char **environ __common;
+extern struct ps_strings *__ps_strings __common;

package/libc/netbsd/lib/csu/common/sysident.S

@@ -0,0 +1,89 @@
+/* $NetBSD: sysident.S,v 1.3 2014/05/14 14:59:14 joerg Exp $ */
+
+/*
+ * Copyright (c) 1997 Christopher G. Demetriou
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *          This product includes software developed for the
+ *          NetBSD Project.  See http://www.NetBSD.org/ for
+ *          information about NetBSD.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
+ */
+
+/*
+ * Here we define the NetBSD OS Version in an ELF .note section, structured
+ * like:
+ *
+ * [NOTE HEADER]
+ *	long		name size
+ *	long		description size
+ *	long		note type
+ *
+ * [NOTE DATUM]
+ *	string		OS name
+ *
+ * OSVERSION notes also have:
+ *	long		OS version (__NetBSD_Version__ constant from param.h)
+ *
+ * The DATUM fields should be padded out such that their actual (not
+ * declared) sizes % 4 == 0.
+ *
+ * These are used by the kernel to determine if this binary is really a
+ * NetBSD binary, or some other OS's.
+ */
+
+#include "sysident_assym.h"
+
+	.section ".note.netbsd.ident", "a"
+	.p2align 2
+
+	.long	ELF_NOTE_NETBSD_NAMESZ
+	.long	ELF_NOTE_NETBSD_DESCSZ
+	.long	ELF_NOTE_TYPE_NETBSD_TAG
+	.ascii	"NetBSD\0\0"	/* ELF_NOTE_NETBSD_NAME */
+	.long	__NetBSD_Version__
+
+	.section ".note.netbsd.pax", "a"
+	.p2align 2
+
+	.long	ELF_NOTE_PAX_NAMESZ
+	.long	ELF_NOTE_PAX_DESCSZ
+	.long	ELF_NOTE_TYPE_PAX_TAG
+	.ascii	"PaX\0"		/* ELF_NOTE_PAX_NAME */
+	.long	0
+
+#ifdef ELF_NOTE_MARCH_DESC
+	.section ".note.netbsd.march", "a"
+	.p2align 2
+
+	.long	ELF_NOTE_MARCH_NAMESZ
+	.long	ELF_NOTE_MARCH_DESCSZ
+	.long	ELF_NOTE_TYPE_MARCH_TAG
+	.ascii	"NetBSD\0\0"
+	.asciz	ELF_NOTE_MARCH_DESC
+	.p2align 2
+#endif

package/libc/netbsd/lib/csu/common/sysident_assym.h

@@ -0,0 +1,17 @@
+/* zig patch: manually expanded from sysident_assym.cf */
+
+#define	ELF_NOTE_NETBSD_NAMESZ		7
+#define	ELF_NOTE_NETBSD_DESCSZ		4
+#define	ELF_NOTE_TYPE_NETBSD_TAG	1
+#define	ELF_NOTE_PAX_NAMESZ		4
+#define	ELF_NOTE_PAX_DESCSZ		4
+#define	ELF_NOTE_TYPE_PAX_TAG		3
+
+/* zig patch: ELF_NOTE_MARCH_DESC and ELF_NOTE_MARCH_DESCSZ defined by the compiler */
+#ifdef ELF_NOTE_MARCH_DESC
+#define	ELF_NOTE_MARCH_NAMESZ		7
+#define	ELF_NOTE_TYPE_MARCH_TAG		5
+#endif
+
+#define	ELF_NOTE_MCMODEL_NAMESZ		7
+#define	ELF_NOTE_TYPE_MCMODEL_TAG	6

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@zigc/lib",
-  "version": "0.15.0-dev.0",
+  "version": "0.15.1",
   "description": "Zig standard library and libc headers (shared across all platforms)",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/ziex-dev/ziex.git"
+    "url": "git+https://github.com/ziex-dev/zigc.git"
   },
   "license": "MIT"
 }

package/std/Build/Step/Compile.zig

@@ -1827,26 +1827,7 @@ fn getZigArgs(compile: *Compile, fuzz: bool) ![][]const u8 {
         _ = try std.fmt.bufPrint(&args_hex_hash, "{x}", .{&args_hash});
 
         const args_file = "args" ++ fs.path.sep_str ++ args_hex_hash;
-        if (b.cache_root.handle.access(args_file, .{})) |_| {
-            // The args file is already present from a previous run.
-        } else |err| switch (err) {
-            error.FileNotFound => {
-                try b.cache_root.handle.makePath("tmp");
-                const rand_int = std.crypto.random.int(u64);
-                const tmp_path = "tmp" ++ fs.path.sep_str ++ std.fmt.hex(rand_int);
-                try b.cache_root.handle.writeFile(.{ .sub_path = tmp_path, .data = args });
-                defer b.cache_root.handle.deleteFile(tmp_path) catch {
-                    // It's fine if the temporary file can't be cleaned up.
-                };
-                b.cache_root.handle.rename(tmp_path, args_file) catch |rename_err| switch (rename_err) {
-                    error.PathAlreadyExists => {
-                        // The args file was created by another concurrent build process.
-                    },
-                    else => |other_err| return other_err,
-                };
-            },
-            else => |other_err| return other_err,
-        }
+        try b.cache_root.handle.writeFile(.{ .sub_path = args_file, .data = args });
 
         const resolved_args_file = try mem.concat(arena, u8, &.{
             "@",

package/std/Build/Step/TranslateC.zig

@@ -163,12 +163,6 @@ fn make(step: *Step, options: Step.MakeOptions) !void {
         try argv_list.append("-fno-clang");
     }
 
-    try argv_list.append("--cache-dir");
-    try argv_list.append(b.cache_root.path orelse ".");
-
-    try argv_list.append("--global-cache-dir");
-    try argv_list.append(b.graph.global_cache_root.path orelse ".");
-
     try argv_list.append("--listen=-");
 
     if (!translate_c.target.query.isNative()) {

package/std/Build/WebServer.zig

@@ -323,7 +323,7 @@ fn serveWebSocket(ws: *WebServer, sock: *http.Server.WebSocket) !noreturn {
                 // Temporarily unlock, then re-lock after the message is sent.
                 ws.time_report_mutex.unlock();
                 defer ws.time_report_mutex.lock();
-                try sock.writeMessage(owned_msg, .binary);
+                try sock.writeMessage(msg, .binary);
             }
         }
 

package/std/Build.zig

@@ -2524,10 +2524,7 @@ pub const LazyPath = union(enum) {
                 .up = gen.up,
                 .sub_path = dupePathInner(allocator, gen.sub_path),
             } },
-            .dependency => |dep| .{ .dependency = .{
-                .dependency = dep.dependency,
-                .sub_path = dupePathInner(allocator, dep.sub_path),
-            } },
+            .dependency => |dep| .{ .dependency = dep },
         };
     }
 };

package/std/Io/Reader/Limited.zig

@@ -27,7 +27,6 @@ pub fn init(reader: *Reader, limit: Limit, buffer: []u8) Limited {
 
 fn stream(r: *Reader, w: *Writer, limit: Limit) Reader.StreamError!usize {
     const l: *Limited = @fieldParentPtr("interface", r);
-    if (l.remaining == .nothing) return error.EndOfStream;
     const combined_limit = limit.min(l.remaining);
     const n = try l.unlimited.stream(w, combined_limit);
     l.remaining = l.remaining.subtract(n).?;
@@ -52,51 +51,8 @@ test stream {
 
 fn discard(r: *Reader, limit: Limit) Reader.Error!usize {
     const l: *Limited = @fieldParentPtr("interface", r);
-    if (l.remaining == .nothing) return error.EndOfStream;
     const combined_limit = limit.min(l.remaining);
     const n = try l.unlimited.discard(combined_limit);
     l.remaining = l.remaining.subtract(n).?;
     return n;
 }
-
-test "end of stream, read, hit limit exactly" {
-    var f: Reader = .fixed("i'm dying");
-    var l = f.limited(.limited(4), &.{});
-    const r = &l.interface;
-
-    var buf: [2]u8 = undefined;
-    try r.readSliceAll(&buf);
-    try r.readSliceAll(&buf);
-    try std.testing.expectError(error.EndOfStream, l.interface.readSliceAll(&buf));
-}
-
-test "end of stream, read, hit limit after partial read" {
-    var f: Reader = .fixed("i'm dying");
-    var l = f.limited(.limited(5), &.{});
-    const r = &l.interface;
-
-    var buf: [2]u8 = undefined;
-    try r.readSliceAll(&buf);
-    try r.readSliceAll(&buf);
-    try std.testing.expectError(error.EndOfStream, l.interface.readSliceAll(&buf));
-}
-
-test "end of stream, discard, hit limit exactly" {
-    var f: Reader = .fixed("i'm dying");
-    var l = f.limited(.limited(4), &.{});
-    const r = &l.interface;
-
-    try r.discardAll(2);
-    try r.discardAll(2);
-    try std.testing.expectError(error.EndOfStream, l.interface.discardAll(2));
-}
-
-test "end of stream, discard, hit limit after partial read" {
-    var f: Reader = .fixed("i'm dying");
-    var l = f.limited(.limited(5), &.{});
-    const r = &l.interface;
-
-    try r.discardAll(2);
-    try r.discardAll(2);
-    try std.testing.expectError(error.EndOfStream, l.interface.discardAll(2));
-}

package/std/Io/Reader.zig

@@ -400,11 +400,10 @@ pub fn defaultReadVec(r: *Reader, data: [][]u8) Error!usize {
         .vtable = &.{ .drain = Writer.fixedDrain },
     };
     const limit: Limit = .limited(writer.buffer.len - writer.end);
-    const n = r.vtable.stream(r, &writer, limit) catch |err| switch (err) {
+    r.end += r.vtable.stream(r, &writer, limit) catch |err| switch (err) {
         error.WriteFailed => unreachable,
         else => |e| return e,
     };
-    r.end += n;
     return 0;
 }
 
@@ -449,6 +448,7 @@ pub fn readVecAll(r: *Reader, data: [][]u8) Error!void {
 /// is returned instead.
 ///
 /// See also:
+/// * `peek`
 /// * `toss`
 pub fn peek(r: *Reader, n: usize) Error![]u8 {
     try r.fill(n);
@@ -699,7 +699,7 @@ pub const DelimiterError = error{
 };
 
 /// Returns a slice of the next bytes of buffered data from the stream until
-/// `sentinel` is found, advancing the seek position past the sentinel.
+/// `sentinel` is found, advancing the seek position.
 ///
 /// Returned slice has a sentinel.
 ///
@@ -732,7 +732,7 @@ pub fn peekSentinel(r: *Reader, comptime sentinel: u8) DelimiterError![:sentinel
 }
 
 /// Returns a slice of the next bytes of buffered data from the stream until
-/// `delimiter` is found, advancing the seek position past the delimiter.
+/// `delimiter` is found, advancing the seek position.
 ///
 /// Returned slice includes the delimiter as the last byte.
 ///
@@ -760,42 +760,31 @@ pub fn takeDelimiterInclusive(r: *Reader, delimiter: u8) DelimiterError![]u8 {
 /// * `peekDelimiterExclusive`
 /// * `takeDelimiterInclusive`
 pub fn peekDelimiterInclusive(r: *Reader, delimiter: u8) DelimiterError![]u8 {
-    {
-        const contents = r.buffer[0..r.end];
-        const seek = r.seek;
-        if (std.mem.indexOfScalarPos(u8, contents, seek, delimiter)) |end| {
-            @branchHint(.likely);
-            return contents[seek .. end + 1];
-        }
+    const buffer = r.buffer[0..r.end];
+    const seek = r.seek;
+    if (std.mem.indexOfScalarPos(u8, buffer, seek, delimiter)) |end| {
+        @branchHint(.likely);
+        return buffer[seek .. end + 1];
     }
-    while (true) {
-        const content_len = r.end - r.seek;
-        if (r.buffer.len - content_len == 0) break;
-        try fillMore(r);
-        const seek = r.seek;
-        const contents = r.buffer[0..r.end];
-        if (std.mem.indexOfScalarPos(u8, contents, seek + content_len, delimiter)) |end| {
-            return contents[seek .. end + 1];
+    // TODO take a parameter for max search length rather than relying on buffer capacity
+    try rebase(r, r.buffer.len);
+    while (r.buffer.len - r.end != 0) {
+        const end_cap = r.buffer[r.end..];
+        var writer: Writer = .fixed(end_cap);
+        const n = r.vtable.stream(r, &writer, .limited(end_cap.len)) catch |err| switch (err) {
+            error.WriteFailed => unreachable,
+            else => |e| return e,
+        };
+        r.end += n;
+        if (std.mem.indexOfScalarPos(u8, end_cap[0..n], 0, delimiter)) |end| {
+            return r.buffer[0 .. r.end - n + end + 1];
         }
     }
-    // It might or might not be end of stream. There is no more buffer space
-    // left to disambiguate. If `StreamTooLong` was added to `RebaseError` then
-    // this logic could be replaced by removing the exit condition from the
-    // above while loop. That error code would represent when `buffer` capacity
-    // is too small for an operation, replacing the current use of asserts.
-    var failing_writer = Writer.failing;
-    while (r.vtable.stream(r, &failing_writer, .limited(1))) |n| {
-        assert(n == 0);
-    } else |err| switch (err) {
-        error.WriteFailed => return error.StreamTooLong,
-        error.ReadFailed => |e| return e,
-        error.EndOfStream => |e| return e,
-    }
+    return error.StreamTooLong;
 }
 
 /// Returns a slice of the next bytes of buffered data from the stream until
-/// `delimiter` is found, advancing the seek position up to (but not past)
-/// the delimiter.
+/// `delimiter` is found, advancing the seek position.
 ///
 /// Returned slice excludes the delimiter. End-of-stream is treated equivalent
 /// to a delimiter, unless it would result in a length 0 return value, in which
@@ -809,44 +798,20 @@ pub fn peekDelimiterInclusive(r: *Reader, delimiter: u8) DelimiterError![]u8 {
 /// Invalidates previously returned values from `peek`.
 ///
 /// See also:
-/// * `takeDelimiter`
 /// * `takeDelimiterInclusive`
 /// * `peekDelimiterExclusive`
 pub fn takeDelimiterExclusive(r: *Reader, delimiter: u8) DelimiterError![]u8 {
-    const result = try r.peekDelimiterExclusive(delimiter);
-    r.toss(result.len);
-    return result;
-}
-
-/// Returns a slice of the next bytes of buffered data from the stream until
-/// `delimiter` is found, advancing the seek position past the delimiter.
-///
-/// Returned slice excludes the delimiter. End-of-stream is treated equivalent
-/// to a delimiter, unless it would result in a length 0 return value, in which
-/// case `null` is returned instead.
-///
-/// If the delimiter is not found within a number of bytes matching the
-/// capacity of this `Reader`, `error.StreamTooLong` is returned. In
-/// such case, the stream state is unmodified as if this function was never
-/// called.
-///
-/// Invalidates previously returned values from `peek`.
-///
-/// See also:
-/// * `takeDelimiterInclusive`
-/// * `takeDelimiterExclusive`
-pub fn takeDelimiter(r: *Reader, delimiter: u8) error{ ReadFailed, StreamTooLong }!?[]u8 {
-    const inclusive = r.peekDelimiterInclusive(delimiter) catch |err| switch (err) {
+    const result = r.peekDelimiterInclusive(delimiter) catch |err| switch (err) {
         error.EndOfStream => {
             const remaining = r.buffer[r.seek..r.end];
-            if (remaining.len == 0) return null;
+            if (remaining.len == 0) return error.EndOfStream;
             r.toss(remaining.len);
             return remaining;
         },
         else => |e| return e,
     };
-    r.toss(inclusive.len);
-    return inclusive[0 .. inclusive.len - 1];
+    r.toss(result.len);
+    return result[0 .. result.len - 1];
 }
 
 /// Returns a slice of the next bytes of buffered data from the stream until
@@ -1369,9 +1334,6 @@ test peekSentinel {
     var r: Reader = .fixed("ab\nc");
     try testing.expectEqualStrings("ab", try r.peekSentinel('\n'));
     try testing.expectEqualStrings("ab", try r.peekSentinel('\n'));
-    r.toss(3);
-    try testing.expectError(error.EndOfStream, r.peekSentinel('\n'));
-    try testing.expectEqualStrings("c", try r.peek(1));
 }
 
 test takeDelimiterInclusive {
@@ -1386,52 +1348,22 @@ test peekDelimiterInclusive {
     try testing.expectEqualStrings("ab\n", try r.peekDelimiterInclusive('\n'));
     r.toss(3);
     try testing.expectError(error.EndOfStream, r.peekDelimiterInclusive('\n'));
-    try testing.expectEqualStrings("c", try r.peek(1));
 }
 
 test takeDelimiterExclusive {
     var r: Reader = .fixed("ab\nc");
-
     try testing.expectEqualStrings("ab", try r.takeDelimiterExclusive('\n'));
-    try testing.expectEqualStrings("", try r.takeDelimiterExclusive('\n'));
-    try testing.expectEqualStrings("", try r.takeDelimiterExclusive('\n'));
-    try testing.expectEqualStrings("\n", try r.take(1));
-
     try testing.expectEqualStrings("c", try r.takeDelimiterExclusive('\n'));
     try testing.expectError(error.EndOfStream, r.takeDelimiterExclusive('\n'));
 }
 
 test peekDelimiterExclusive {
     var r: Reader = .fixed("ab\nc");
-
     try testing.expectEqualStrings("ab", try r.peekDelimiterExclusive('\n'));
     try testing.expectEqualStrings("ab", try r.peekDelimiterExclusive('\n'));
-    r.toss(2);
-    try testing.expectEqualStrings("", try r.peekDelimiterExclusive('\n'));
-    try testing.expectEqualStrings("\n", try r.take(1));
-
+    r.toss(3);
     try testing.expectEqualStrings("c", try r.peekDelimiterExclusive('\n'));
     try testing.expectEqualStrings("c", try r.peekDelimiterExclusive('\n'));
-    r.toss(1);
-    try testing.expectError(error.EndOfStream, r.peekDelimiterExclusive('\n'));
-}
-
-test takeDelimiter {
-    var r: Reader = .fixed("ab\nc\n\nd");
-    try testing.expectEqualStrings("ab", (try r.takeDelimiter('\n')).?);
-    try testing.expectEqualStrings("c", (try r.takeDelimiter('\n')).?);
-    try testing.expectEqualStrings("", (try r.takeDelimiter('\n')).?);
-    try testing.expectEqualStrings("d", (try r.takeDelimiter('\n')).?);
-    try testing.expectEqual(null, try r.takeDelimiter('\n'));
-    try testing.expectEqual(null, try r.takeDelimiter('\n'));
-
-    r = .fixed("ab\nc\n\nd\n"); // one trailing newline does not affect behavior
-    try testing.expectEqualStrings("ab", (try r.takeDelimiter('\n')).?);
-    try testing.expectEqualStrings("c", (try r.takeDelimiter('\n')).?);
-    try testing.expectEqualStrings("", (try r.takeDelimiter('\n')).?);
-    try testing.expectEqualStrings("d", (try r.takeDelimiter('\n')).?);
-    try testing.expectEqual(null, try r.takeDelimiter('\n'));
-    try testing.expectEqual(null, try r.takeDelimiter('\n'));
 }
 
 test streamDelimiter {
@@ -1601,18 +1533,6 @@ test "readSliceShort with smaller buffer than Reader" {
     try testing.expectEqualStrings(str, &buf);
 }
 
-test "readSliceShort with indirect reader" {
-    var r: Reader = .fixed("HelloFren");
-    var ri_buf: [3]u8 = undefined;
-    var ri: std.testing.ReaderIndirect = .init(&r, &ri_buf);
-    var buf: [5]u8 = undefined;
-    try testing.expectEqual(5, try ri.interface.readSliceShort(&buf));
-    try testing.expectEqualStrings("Hello", buf[0..5]);
-    try testing.expectEqual(4, try ri.interface.readSliceShort(&buf));
-    try testing.expectEqualStrings("Fren", buf[0..4]);
-    try testing.expectEqual(0, try ri.interface.readSliceShort(&buf));
-}
-
 test readVec {
     var r: Reader = .fixed(std.ascii.letters);
     var flat_buffer: [52]u8 = undefined;
@@ -1722,26 +1642,6 @@ test "takeDelimiterInclusive when it rebases" {
     }
 }
 
-test "takeDelimiterInclusive on an indirect reader when it rebases" {
-    const written_line = "ABCDEFGHIJKLMNOPQRSTUVWXYZ\n";
-    var buffer: [128]u8 = undefined;
-    var tr: std.testing.Reader = .init(&buffer, &.{
-        .{ .buffer = written_line[0..4] },
-        .{ .buffer = written_line[4..] },
-        .{ .buffer = written_line },
-        .{ .buffer = written_line },
-        .{ .buffer = written_line },
-        .{ .buffer = written_line },
-        .{ .buffer = written_line },
-    });
-    var indirect_buffer: [128]u8 = undefined;
-    var tri: std.testing.ReaderIndirect = .init(&tr.interface, &indirect_buffer);
-    const r = &tri.interface;
-    for (0..6) |_| {
-        try std.testing.expectEqualStrings(written_line, try r.takeDelimiterInclusive('\n'));
-    }
-}
-
 test "takeStruct and peekStruct packed" {
     var r: Reader = .fixed(&.{ 0b11110000, 0b00110011 });
     const S = packed struct(u16) { a: u2, b: u6, c: u7, d: u1 };