From c70832bc411388c3e9749013d7cf99704ff95a36 Mon Sep 17 00:00:00 2001
From: Benjamin Graf <bgraf@posteo.de>
Date: Sat, 13 Feb 2021 20:24:52 +0100
Subject: [PATCH] replace ArrayList.shrinkAndFree by
 ArrayList.shrinkRetainingCapacity

---
 lib/std/fs.zig           | 2 +-
 lib/std/io/reader.zig    | 2 +-
 lib/std/json.zig         | 2 +-
 lib/std/math/big/int.zig | 2 +-
 lib/std/net.zig          | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/std/fs.zig b/lib/std/fs.zig
index 17c0cb7b1d..53108ebe23 100644
--- a/lib/std/fs.zig
+++ b/lib/std/fs.zig
@@ -2186,7 +2186,7 @@ pub const Walker = struct {
             var top = &self.stack.items[self.stack.items.len - 1];
             const dirname_len = top.dirname_len;
             if (try top.dir_it.next()) |base| {
-                self.name_buffer.shrinkAndFree(dirname_len);
+                self.name_buffer.shrinkRetainingCapacity(dirname_len);
                 try self.name_buffer.append(path.sep);
                 try self.name_buffer.appendSlice(base.name);
                 if (base.kind == .Directory) {
diff --git a/lib/std/io/reader.zig b/lib/std/io/reader.zig
index e174051518..916e2155fa 100644
--- a/lib/std/io/reader.zig
+++ b/lib/std/io/reader.zig
@@ -111,7 +111,7 @@ pub fn Reader(
             delimiter: u8,
             max_size: usize,
         ) !void {
-            array_list.shrinkAndFree(0);
+            array_list.shrinkRetainingCapacity(0);
             while (true) {
                 var byte: u8 = try self.readByte();
 
diff --git a/lib/std/json.zig b/lib/std/json.zig
index ff258c7f3a..f9fc371049 100644
--- a/lib/std/json.zig
+++ b/lib/std/json.zig
@@ -2018,7 +2018,7 @@ pub const Parser = struct {
 
     pub fn reset(p: *Parser) void {
         p.state = .Simple;
-        p.stack.shrinkAndFree(0);
+        p.stack.shrinkRetainingCapacity(0);
     }
 
     pub fn parse(p: *Parser, input: []const u8) !ValueTree {
diff --git a/lib/std/math/big/int.zig b/lib/std/math/big/int.zig
index 81982eac51..d1d7b33508 100644
--- a/lib/std/math/big/int.zig
+++ b/lib/std/math/big/int.zig
@@ -607,7 +607,7 @@ pub const Mutable = struct {
     /// it will have the same length as it had when the function was called.
     pub fn gcd(rma: *Mutable, x: Const, y: Const, limbs_buffer: *std.ArrayList(Limb)) !void {
         const prev_len = limbs_buffer.items.len;
-        defer limbs_buffer.shrinkAndFree(prev_len);
+        defer limbs_buffer.shrinkRetainingCapacity(prev_len);
         const x_copy = if (rma.limbs.ptr == x.limbs.ptr) blk: {
             const start = limbs_buffer.items.len;
             try limbs_buffer.appendSlice(x.limbs);
diff --git a/lib/std/net.zig b/lib/std/net.zig
index 2d62a27cd9..636596c117 100644
--- a/lib/std/net.zig
+++ b/lib/std/net.zig
@@ -1205,13 +1205,13 @@ fn linuxLookupNameFromDnsSearch(
 
     var tok_it = mem.tokenize(search, " \t");
     while (tok_it.next()) |tok| {
-        canon.shrinkAndFree(canon_name.len + 1);
+        canon.shrinkRetainingCapacity(canon_name.len + 1);
         try canon.appendSlice(tok);
         try linuxLookupNameFromDns(addrs, canon, canon.items, family, rc, port);
         if (addrs.items.len != 0) return;
     }
 
-    canon.shrinkAndFree(canon_name.len);
+    canon.shrinkRetainingCapacity(canon_name.len);
     return linuxLookupNameFromDns(addrs, canon, name, family, rc, port);
 }