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

Return instead of collecting to mut result.

Browse source
This commit is contained in:
Daan de Graaf 2018-12-28 12:52:31 +01:00 committed by Saleem Jaffer
parent e395026aba
commit ed716d4c89
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1833,17 +1833,19 @@ impl<'a, 'tcx, C> TyLayoutMethods<'tcx, C> for Ty<'tcx>
})
}
fn pointee_info_at(this: TyLayout<'tcx>, cx: &C, offset: Size
fn pointee_info_at(
this: TyLayout<'tcx>,
cx: &C,
offset: Size,
) -> Option<PointeeInfo> {
let mut result = None;
match this.ty.sty {
ty::RawPtr(mt) if offset.bytes() == 0 => {
result = cx.layout_of(mt.ty).ok()
cx.layout_of(mt.ty).ok()
.map(|layout| PointeeInfo {
size: layout.size,
align: layout.align.abi,
safe: None,
});
})
}
ty::Ref(_, ty, mt) if offset.bytes() == 0 => {
@ -1877,12 +1879,12 @@ impl<'a, 'tcx, C> TyLayoutMethods<'tcx, C> for Ty<'tcx>
}
};
result = cx.layout_of(ty).ok()
cx.layout_of(ty).ok()
.map(|layout| PointeeInfo {
size: layout.size,
align: layout.align.abi,
safe: Some(kind),
});
})
}
_ => {
@ -1915,6 +1917,8 @@ impl<'a, 'tcx, C> TyLayoutMethods<'tcx, C> for Ty<'tcx>
}
}
let mut result = None;
if let Some(variant) = data_variant {
let ptr_end = offset + Pointer.size(cx);
for i in 0..variant.fields.count() {
@ -1945,10 +1949,10 @@ impl<'a, 'tcx, C> TyLayoutMethods<'tcx, C> for Ty<'tcx>
}
}
}
result
}
}
result
}
}