squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

resolving conflicts

Browse source
This commit is contained in:
Saleem Jaffer 2019-05-04 16:10:47 +05:30
parent 18679cdc54
commit 94a48924da
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/librustc/ty/layout.rs
View file

@ -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 {