diff options
| author | Saleem Jaffer <ssaleem1992@gmail.com> | 2019-05-04 16:10:47 +0530 |
|---|---|---|
| committer | Saleem Jaffer <ssaleem1992@gmail.com> | 2019-05-04 16:10:47 +0530 |
| commit | 94a48924da05d2c3c147ce7739d497fdcf33ca01 (patch) | |
| tree | 64040d5545bcbc6a8f019339b2a90552421a847f | |
| parent | 18679cdc54c91140499f4113f2d1122f200ac7fb (diff) | |
| download | rust-94a48924da05d2c3c147ce7739d497fdcf33ca01.tar.gz rust-94a48924da05d2c3c147ce7739d497fdcf33ca01.zip | |
resolving conflicts
| -rw-r--r-- | src/librustc/ty/layout.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/librustc/ty/layout.rs b/src/librustc/ty/layout.rs index d4b93ed4785..dc9eaf5592e 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 { |