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

Centril · web-flow · commit 4387e7b640db · 2019-12-08T10:14:01.000+01:00
Simplify `Layout::extend_packed`
diff --git a/src/libcore/alloc.rs b/src/libcore/alloc.rs
@@ -310,8 +310,7 @@ impl Layout {
     pub fn extend_packed(&self, next: Self) -> Result<Self, LayoutErr> {
         let new_size = self.size().checked_add(next.size())
             .ok_or(LayoutErr { private: () })?;
-        let layout = Layout::from_size_align(new_size, self.align())?;
-        Ok(layout)
+        Layout::from_size_align(new_size, self.align())
     }
 
     /// Creates a layout describing the record for a `[T; n]`.

Original file line number	Diff line number	Diff line change
`@@ -310,8 +310,7 @@ impl Layout {`
`310`	`310`	`pub fn extend_packed(&self, next: Self) -> Result<Self, LayoutErr> {`
`311`	`311`	`let new_size = self.size().checked_add(next.size())`
`312`	`312`	`.ok_or(LayoutErr { private: () })?;`
`313`		`- let layout = Layout::from_size_align(new_size, self.align())?;`
`314`		`- Ok(layout)`
	`313`	`+ Layout::from_size_align(new_size, self.align())`
`315`	`314`	`}`
`316`	`315`
`317`	`316`	/// Creates a layout describing the record for a `[T; n]`.