Rollup merge of #86755 - ojeda:shrink, r=Mark-Simulacrum

alloc: `RawVec<T, A>::shrink` can be in `no_global_oom_handling`. Found in Rust-for-Linux/linux#402. Signed-off-by: Miguel Ojeda <[email protected]>
rust-lang · Jun 30, 2021 · 9e007e7 · 9e007e7
2 parents 7714a9a + 7c9445d
commit 9e007e7
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/library/alloc/src/raw_vec.rs b/library/alloc/src/raw_vec.rs
@@ -463,7 +463,6 @@ impl<T, A: Allocator> RawVec<T, A> {
         Ok(())
     }
 
-    #[cfg(not(no_global_oom_handling))]
     fn shrink(&mut self, amount: usize) -> Result<(), TryReserveError> {
         assert!(amount <= self.capacity(), "Tried to shrink to a larger capacity");