Merge rust-lang#67

67: Change shrink_to to not panic if min_capacity < capacity r=Amanieu a=Amanieu

cc rust-lang/rust#56431

Co-authored-by: Amanieu d'Antras <[email protected]>

src/map.rs

@@ -626,8 +626,8 @@ where
     /// down no lower than the supplied limit while maintaining the internal rules
     /// and possibly leaving some space in accordance with the resize policy.
     ///
-    /// Panics if the current capacity is smaller than the supplied
-    /// minimum capacity.
+    /// This function does nothing if the current capacity is smaller than the
+    /// supplied minimum capacity.
     ///
     /// # Examples
     ///
@@ -642,14 +642,11 @@ where
     /// assert!(map.capacity() >= 10);
     /// map.shrink_to(0);
     /// assert!(map.capacity() >= 2);
+    /// map.shrink_to(10);
+    /// assert!(map.capacity() >= 2);
     /// ```
     #[inline]
     pub fn shrink_to(&mut self, min_capacity: usize) {
-        assert!(
-            self.capacity() >= min_capacity,
-            "Tried to shrink to a larger capacity"
-        );
-
         let hash_builder = &self.hash_builder;
         self.table
             .shrink_to(min_capacity, |x| make_hash(hash_builder, &x.0));

src/raw/mod.rs

@@ -601,9 +601,7 @@ impl<T> RawTable<T> {
         };
 
         // If we have more buckets than we need, shrink the table.
-        if min_buckets != self.buckets() {
-            debug_assert!(min_buckets < self.buckets());
-
+        if min_buckets < self.buckets() {
             // Fast path if the table is empty
             if self.items == 0 {
                 *self = Self::with_capacity(min_size)