From 18d390883efc7eaf5ced77d89abc5b51c8b7f816 Mon Sep 17 00:00:00 2001
From: Cai Bear <git@caibear.com>
Date: Sat, 23 Mar 2024 21:27:59 -0700
Subject: Remove len argument from RawVec::reserve_for_push because it's always
 equal to capacity. Also make Vec::insert use reserve_for_push.

---
 library/alloc/src/vec/mod.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'library/alloc/src/vec/mod.rs')

diff --git a/library/alloc/src/vec/mod.rs b/library/alloc/src/vec/mod.rs
index 8ca8046dac5..5f4c45d578d 100644
--- a/library/alloc/src/vec/mod.rs
+++ b/library/alloc/src/vec/mod.rs
@@ -1547,7 +1547,7 @@ impl<T, A: Allocator> Vec<T, A> {
 
         // space for the new element
         if len == self.buf.capacity() {
-            self.reserve(1);
+            self.buf.reserve_for_push();
         }
 
         unsafe {
@@ -1967,7 +1967,7 @@ impl<T, A: Allocator> Vec<T, A> {
         // This will panic or abort if we would allocate > isize::MAX bytes
         // or if the length increment would overflow for zero-sized types.
         if self.len == self.buf.capacity() {
-            self.buf.reserve_for_push(self.len);
+            self.buf.reserve_for_push();
         }
         unsafe {
             let end = self.as_mut_ptr().add(self.len);
-- 
cgit 1.4.1-3-g733a5


From aba592d09c78fcf1432de24c200fffa2fb21aeb6 Mon Sep 17 00:00:00 2001
From: Cai Bear <git@caibear.com>
Date: Thu, 28 Mar 2024 16:38:01 -0700
Subject: Rename reserve_for_push to grow_one and fix comment.

---
 library/alloc/src/collections/vec_deque/mod.rs | 2 +-
 library/alloc/src/raw_vec.rs                   | 6 +++---
 library/alloc/src/vec/mod.rs                   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'library/alloc/src/vec/mod.rs')

diff --git a/library/alloc/src/collections/vec_deque/mod.rs b/library/alloc/src/collections/vec_deque/mod.rs
index e1341c21af6..5ff7f184a6d 100644
--- a/library/alloc/src/collections/vec_deque/mod.rs
+++ b/library/alloc/src/collections/vec_deque/mod.rs
@@ -2087,7 +2087,7 @@ impl<T, A: Allocator> VecDeque<T, A> {
         // buffer without it being full emerge
         debug_assert!(self.is_full());
         let old_cap = self.capacity();
-        self.buf.reserve_for_push();
+        self.buf.grow_one();
         unsafe {
             self.handle_capacity_increase(old_cap);
         }
diff --git a/library/alloc/src/raw_vec.rs b/library/alloc/src/raw_vec.rs
index 45258cc86ff..0883080d735 100644
--- a/library/alloc/src/raw_vec.rs
+++ b/library/alloc/src/raw_vec.rs
@@ -345,11 +345,11 @@ impl<T, A: Allocator> RawVec<T, A> {
         }
     }
 
-    /// A specialized version of `reserve()` used only by the hot and
-    /// oft-instantiated `Vec::push()`, which does its own capacity check.
+    /// A specialized version of `self.reserve(len, 1)` which requires the
+    /// caller to ensure `len == self.capacity()`.
     #[cfg(not(no_global_oom_handling))]
     #[inline(never)]
-    pub fn reserve_for_push(&mut self) {
+    pub fn grow_one(&mut self) {
         if let Err(err) = self.grow_amortized(self.cap.0, 1) {
             handle_error(err);
         }
diff --git a/library/alloc/src/vec/mod.rs b/library/alloc/src/vec/mod.rs
index 5f4c45d578d..7e3463bc082 100644
--- a/library/alloc/src/vec/mod.rs
+++ b/library/alloc/src/vec/mod.rs
@@ -1547,7 +1547,7 @@ impl<T, A: Allocator> Vec<T, A> {
 
         // space for the new element
         if len == self.buf.capacity() {
-            self.buf.reserve_for_push();
+            self.buf.grow_one();
         }
 
         unsafe {
@@ -1967,7 +1967,7 @@ impl<T, A: Allocator> Vec<T, A> {
         // This will panic or abort if we would allocate > isize::MAX bytes
         // or if the length increment would overflow for zero-sized types.
         if self.len == self.buf.capacity() {
-            self.buf.reserve_for_push();
+            self.buf.grow_one();
         }
         unsafe {
             let end = self.as_mut_ptr().add(self.len);
-- 
cgit 1.4.1-3-g733a5