nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-03 13:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove checked_add in Layout::repeat

Browse Source
This commit is contained in:
Matthew Kraai 2019-12-09 06:49:37 -08:00
parent 3ff17e7c5f
commit a983e0590a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libcore/alloc.rs
View File

@ -239,8 +239,11 @@ impl Layout {
#[unstable(feature = "alloc_layout_extra", issue = "55724")] #[unstable(feature = "alloc_layout_extra", issue = "55724")]
#[inline] #[inline]
pub fn repeat(&self, n: usize) -> Result<(Self, usize), LayoutErr> { pub fn repeat(&self, n: usize) -> Result<(Self, usize), LayoutErr> {
let padded_size = self.size().checked_add(self.padding_needed_for(self.align())) // This cannot overflow. Quoting from the invariant of Layout:
.ok_or(LayoutErr { private: () })?; // > `size`, when rounded up to the nearest multiple of `align`,
// > must not overflow (i.e., the rounded value must be less than
// > `usize::MAX`)
let padded_size = self.size() + self.padding_needed_for(self.align());
let alloc_size = padded_size.checked_mul(n) let alloc_size = padded_size.checked_mul(n)
.ok_or(LayoutErr { private: () })?; .ok_or(LayoutErr { private: () })?;