From 94a48924da05d2c3c147ce7739d497fdcf33ca01 Mon Sep 17 00:00:00 2001
From: Saleem Jaffer <ssaleem1992@gmail.com>
Date: Sat, 4 May 2019 16:10:47 +0530
Subject: [PATCH] resolving conflicts

---
 src/librustc/ty/layout.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/librustc/ty/layout.rs b/src/librustc/ty/layout.rs
index d4b93ed478502..dc9eaf5592e39 100644
--- a/src/librustc/ty/layout.rs
+++ b/src/librustc/ty/layout.rs
@@ -1720,10 +1720,9 @@ impl<'a, 'tcx, C> TyLayoutMethods<'tcx, C> for Ty<'tcx>
         let tcx = cx.tcx();
         let discr_layout = |discr: &Scalar| -> C::TyLayout {
             let layout = LayoutDetails::scalar(cx, discr.clone());
-            MaybeResult::from_ok(TyLayout {
-                details: tcx.intern_layout(layout),
-                ty: discr.value.to_ty(tcx)
-            })
+            MaybeResult::from(Ok(
+                TyLayout {details: tcx.intern_layout(layout),ty: discr.value.to_ty(tcx)}
+            ))
         };
 
         cx.layout_of(match this.ty.sty {