about summary refs log tree commit diff
path: root/library/alloc/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-08-19 02:56:59 +0000
committerbors <bors@rust-lang.org>2020-08-19 02:56:59 +0000
commitc03c213daf5fe3b52c768b4f145e45d8994d87ea (patch)
treeb488c721612200aa759bec506625cb2d2460ced7 /library/alloc/src
parent1656582822a80139d725e56f00c564f4f58f2883 (diff)
parent7551f3fbbd51391492520a3dc1dcc2f600644eea (diff)
downloadrust-c03c213daf5fe3b52c768b4f145e45d8994d87ea.tar.gz
rust-c03c213daf5fe3b52c768b4f145e45d8994d87ea.zip
Auto merge of #75677 - cuviper:shrink-towel, r=Mark-Simulacrum
Don't panic in Vec::shrink_to_fit

We can help the compiler see that `Vec::shrink_to_fit` will never reach the panic case in `RawVec::shrink_to_fit`, just by guarding the call only for cases where the capacity is strictly greater. A capacity less than the length is only possible through an unsafe call to `set_len`, which would break the `Vec` invariants, so `shrink_to_fit` can just ignore that.

This removes the panicking code from the examples in both #71861 and #75636.
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);
         }
     }