Merge pull request #13666 from ziglang/allocator-interface

std.mem.Allocator: allow shrink to fail

3 files changed, 6 insertions, 8 deletions

diff --git a/lib/std/fs/file.zig b/lib/std/fs/file.zig
index 0b5ba6de0b..a1e81c9b94 100644
--- a/lib/std/fs/file.zig
+++ b/lib/std/fs/file.zig
@@ -954,11 +954,9 @@ pub const File = struct {
         };
 
         if (optional_sentinel) |sentinel| {
-            try array_list.append(sentinel);
-            const buf = array_list.toOwnedSlice();
-            return buf[0 .. buf.len - 1 :sentinel];
+            return try array_list.toOwnedSliceSentinel(sentinel);
         } else {
-            return array_list.toOwnedSlice();
+            return try array_list.toOwnedSlice();
         }
     }
 
diff --git a/lib/std/fs/path.zig b/lib/std/fs/path.zig
index f4b5a3cf6e..91244e34bd 100644
--- a/lib/std/fs/path.zig
+++ b/lib/std/fs/path.zig
@@ -1155,7 +1155,7 @@ pub fn relativePosix(allocator: Allocator, from: []const u8, to: []const u8) ![]
         }
         if (to_rest.len == 0) {
             // shave off the trailing slash
-            return allocator.shrink(result, result_index - 1);
+            return allocator.realloc(result, result_index - 1);
         }
 
         mem.copy(u8, result[result_index..], to_rest);
diff --git a/lib/std/fs/wasi.zig b/lib/std/fs/wasi.zig
index 6358873ede..706cec905e 100644
--- a/lib/std/fs/wasi.zig
+++ b/lib/std/fs/wasi.zig
@@ -160,7 +160,7 @@ pub const PreopenList = struct {
         if (cwd_root) |root| assert(fs.path.isAbsolute(root));
 
         // Clear contents if we're being called again
-        for (self.toOwnedSlice()) |preopen| {
+        for (try self.toOwnedSlice()) |preopen| {
             switch (preopen.type) {
                 PreopenType.Dir => |path| self.buffer.allocator.free(path),
             }
@@ -263,8 +263,8 @@ pub const PreopenList = struct {
     }
 
     /// The caller owns the returned memory. ArrayList becomes empty.
-    pub fn toOwnedSlice(self: *Self) []Preopen {
-        return self.buffer.toOwnedSlice();
+    pub fn toOwnedSlice(self: *Self) ![]Preopen {
+        return try self.buffer.toOwnedSlice();
     }
 };