mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #67138 - kraai:simplify-Layout-extend_packed, r=Amanieu

Browse Source 
Simplify `Layout::extend_packed`
This commit is contained in:
Tyler Mandry 2019-12-09 14:33:09 -08:00 committed by GitHub
commit 6b6b6f3220
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libcore/alloc.rs
View File

@ -310,8 +310,7 @@ impl Layout {
pub fn extend_packed(&self, next: Self) -> Result<Self, LayoutErr> { pub fn extend_packed(&self, next: Self) -> Result<Self, LayoutErr> {
let new_size = self.size().checked_add(next.size()) let new_size = self.size().checked_add(next.size())
.ok_or(LayoutErr { private: () })?; .ok_or(LayoutErr { private: () })?;
let layout = Layout::from_size_align(new_size, self.align())?; Layout::from_size_align(new_size, self.align())
Ok(layout)
} }
/// Creates a layout describing the record for a `[T; n]`. /// Creates a layout describing the record for a `[T; n]`.