squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

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

Browse source 
alloc: `RawVec<T, A>::shrink` can be in `no_global_oom_handling`.

Found in https://github.com/Rust-for-Linux/linux/pull/402.

Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
This commit is contained in:
Yuki Okushi 2021-07-01 05:21:03 +09:00 committed by GitHub
commit 9e007e71ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
library/alloc/src/raw_vec.rs
View file

@ -463,7 +463,6 @@ impl<T, A: Allocator> RawVec<T, A> {
Ok(()) Ok(())
} }
#[cfg(not(no_global_oom_handling))]
fn shrink(&mut self, amount: usize) -> Result<(), TryReserveError> { fn shrink(&mut self, amount: usize) -> Result<(), TryReserveError> {
assert!(amount <= self.capacity(), "Tried to shrink to a larger capacity"); assert!(amount <= self.capacity(), "Tried to shrink to a larger capacity");