nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-08 16:07:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

mir: remove a hacky recursive helper function

Browse Source
This commit is contained in:
ljedrz 2018-11-07 17:00:51 +01:00
parent ddd4b194a0
commit 5159b32997
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/librustc_mir/transform/promote_consts.rs
View File

@ -310,16 +310,11 @@ impl<'a, 'tcx> Promoter<'a, 'tcx> {
match statement.kind { match statement.kind {
StatementKind::Assign(_, box Rvalue::Ref(_, _, ref mut place)) => { StatementKind::Assign(_, box Rvalue::Ref(_, _, ref mut place)) => {
// Find the underlying local for this (necessarily interior) borrow. // Find the underlying local for this (necessarily interior) borrow.
// HACK(eddyb) using a recursive function because of mutable borrows. let mut place = place;
fn interior_base<'a, 'tcx>(place: &'a mut Place<'tcx>) while let Place::Projection(ref mut proj) = *place {
-> &'a mut Place<'tcx> { assert_ne!(proj.elem, ProjectionElem::Deref);
if let Place::Projection(ref mut proj) = *place { place = &mut proj.base;
assert_ne!(proj.elem, ProjectionElem::Deref); };
return interior_base(&mut proj.base);
}
place
}
let place = interior_base(place);
let ty = place.ty(local_decls, self.tcx).to_ty(self.tcx); let ty = place.ty(local_decls, self.tcx).to_ty(self.tcx);
let span = statement.source_info.span; let span = statement.source_info.span;