about summary refs log tree commit diff
path: root/library/alloc/src
diff options
context:
space:
mode:
authorJosh Stone <jistone@redhat.com>2020-08-18 11:45:40 -0700
committerJosh Stone <jistone@redhat.com>2020-08-18 11:45:40 -0700
commit7551f3fbbd51391492520a3dc1dcc2f600644eea (patch)
tree9388625cf0bda6afc6d52452117274919a30c731 /library/alloc/src
parenta45dedf3d07dd2c088d89b5e5b7f4c7912b0812f (diff)
downloadrust-7551f3fbbd51391492520a3dc1dcc2f600644eea.tar.gz
rust-7551f3fbbd51391492520a3dc1dcc2f600644eea.zip
Don't panic in Vec::shrink_to_fit
Diffstat (limited to 'library/alloc/src')
-rw-r--r--library/alloc/src/vec.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/library/alloc/src/vec.rs b/library/alloc/src/vec.rs
index 8ca0a0883cb..80f7ff4893e 100644
--- a/library/alloc/src/vec.rs
+++ b/library/alloc/src/vec.rs
@@ -622,7 +622,10 @@ impl<T> Vec<T> {
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
     pub fn shrink_to_fit(&mut self) {
-        if self.capacity() != self.len {
+        // The capacity is never less than the length, and there's nothing to do when
+        // they are equal, so we can avoid the panic case in `RawVec::shrink_to_fit`
+        // by only calling it with a greater capacity.
+        if self.capacity() > self.len {
             self.buf.shrink_to_fit(self.len);
         }
     }