Avoid using map_err

rust-lang · Aug 7, 2021 · 03498aa · 03498aa
1 parent e7f1c8e
commit 03498aa
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/library/alloc/src/raw_vec.rs b/library/alloc/src/raw_vec.rs
@@ -472,9 +472,12 @@ impl<T, A: Allocator> RawVec<T, A> {
             // `Layout::array` cannot overflow here because it would have
             // owerflown earlier when capacity was larger.
             let new_layout = Layout::array::<T>(amount).unwrap_unchecked();
-            self.alloc
-                .shrink(ptr, layout, new_layout)
-                .map_err(|_| AllocError { layout: new_layout, non_exhaustive: () })?
+            // We avoid `map_err` here because it bloats the amount of LLVM IR
+            // generated.
+            match self.alloc.shrink(ptr, layout, new_layout) {
+                Ok(ptr) => ptr,
+                Err(_) => Err(AllocError { layout: new_layout, non_exhaustive: () })?,
+            }
         };
         self.set_ptr(ptr);
         Ok(())