Merge pull request #25302 from ziglang/growCapacity

std: remove loop from growCapacity

1 files changed, 1 insertions, 13 deletions

diff --git a/lib/std/deque.zig b/lib/std/deque.zig
index 7130cd33fe..267b8a0afe 100644
--- a/lib/std/deque.zig
+++ b/lib/std/deque.zig
@@ -56,7 +56,7 @@ pub fn Deque(comptime T: type) type {
         /// Invalidates element pointers if additional memory is needed.
         pub fn ensureTotalCapacity(deque: *Self, gpa: Allocator, new_capacity: usize) Allocator.Error!void {
             if (deque.buffer.len >= new_capacity) return;
-            return deque.ensureTotalCapacityPrecise(gpa, growCapacity(deque.buffer.len, new_capacity));
+            return deque.ensureTotalCapacityPrecise(gpa, std.ArrayList(T).growCapacity(new_capacity));
         }
 
         /// If the current capacity is less than `new_capacity`, this function will
@@ -243,18 +243,6 @@ pub fn Deque(comptime T: type) type {
                 return index - head_len;
             }
         }
-
-        const init_capacity: comptime_int = @max(1, std.atomic.cache_line / @sizeOf(T));
-
-        /// Called when memory growth is necessary. Returns a capacity larger than
-        /// minimum that grows super-linearly.
-        fn growCapacity(current: usize, minimum: usize) usize {
-            var new = current;
-            while (true) {
-                new +|= new / 2 + init_capacity;
-                if (new >= minimum) return new;
-            }
-        }
     };
 }