From 2b2b16c2a47512ab30df9ef74d85b9b703f6bbe0 Mon Sep 17 00:00:00 2001
From: Matthew Kraai <kraai@ftbfs.org>
Date: Fri, 6 Dec 2019 09:09:56 -0800
Subject: [PATCH] Simplify `Layout::extend_packed`

---
 src/libcore/alloc.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/libcore/alloc.rs b/src/libcore/alloc.rs
index 20248f7f6c13e..d8e9fe5fbe2f7 100644
--- 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]`.