user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Layout::pad_to_align type mismatch

Browse source
This commit is contained in:
Christopher Durham 2019-11-09 15:28:32 -05:00 • committed by GitHub
parent fd3594b9ee
commit 183e61b661
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libcore/alloc.rs
View file

@ -224,9 +224,10 @@ impl Layout {
// > must not overflow (i.e., the rounded value must be less than
// > `usize::MAX`)
let new_size = self.size() + pad;
debug_assert!(new_size > self.size());
Layout::from_size_align(new_size, self.align())
// SAFETY: This necessarily respectes the from_size_align
// prerequisites per the above.
unsafe { Layout::from_size_align_unchecked(new_size, self.align()) }
}
/// Creates a layout describing the record for `n` instances of