diff options
| author | Nicholas Nethercote <nnethercote@mozilla.com> | 2020-05-20 09:47:21 +1000 |
|---|---|---|
| committer | Nicholas Nethercote <nnethercote@mozilla.com> | 2020-05-20 09:57:14 +1000 |
| commit | 9eb0399a9d506f5f421180fa00ee3eec61a3a41e (patch) | |
| tree | 6f2ef71b2d5026b50c1f409518280becf9097f22 /src/liballoc | |
| parent | 3a7dfda40a3e798bf086bd58cc7e5e09deb808b5 (diff) | |
| download | rust-9eb0399a9d506f5f421180fa00ee3eec61a3a41e.tar.gz rust-9eb0399a9d506f5f421180fa00ee3eec61a3a41e.zip | |
Adjust the zero check in `RawVec::grow`.
This was supposed to land as part of #72227. (I wish `git push` would abort when you have uncommited changes.)
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/raw_vec.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/liballoc/raw_vec.rs b/src/liballoc/raw_vec.rs index f348b5b6978..2bd4733db42 100644 --- a/src/liballoc/raw_vec.rs +++ b/src/liballoc/raw_vec.rs @@ -401,16 +401,15 @@ impl<T, A: AllocRef> RawVec<T, A> { needed_extra_capacity: usize, placement: ReallocPlacement, ) -> Result<(), TryReserveError> { + // This is ensured by the calling contexts. + debug_assert!(needed_extra_capacity > 0); + if mem::size_of::<T>() == 0 { // Since we return a capacity of `usize::MAX` when `elem_size` is // 0, getting to here necessarily means the `RawVec` is overfull. return Err(CapacityOverflow); } - if needed_extra_capacity == 0 { - return Ok(()); - } - // Nothing we can really do about these checks, sadly. let required_cap = used_capacity.checked_add(needed_extra_capacity).ok_or(CapacityOverflow)?; |
