OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rustc_mir: don't miss the autoref when doing an unsize

Browse Source
This commit is contained in:
Ariel Ben-Yehuda 2015-11-11 00:07:34 +02:00
parent c1bfd0ca6b
commit cd1585ffb3
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/librustc_mir/hair/cx/expr.rs
View File

@ -386,14 +386,7 @@ impl<'tcx> Mirror<'tcx> for &'tcx hir::Expr {
}; };
} }
if let Some(target) = adj.unsize { if let Some(autoref) = adj.autoref {
expr = Expr {
temp_lifetime: temp_lifetime,
ty: target,
span: self.span,
kind: ExprKind::Unsize { source: expr.to_ref() },
};
} else if let Some(autoref) = adj.autoref {
let adjusted_ty = expr.ty.adjust_for_autoref(cx.tcx, Some(autoref)); let adjusted_ty = expr.ty.adjust_for_autoref(cx.tcx, Some(autoref));
match autoref { match autoref {
ty::adjustment::AutoPtr(r, m) => { ty::adjustment::AutoPtr(r, m) => {
@ -433,6 +426,15 @@ impl<'tcx> Mirror<'tcx> for &'tcx hir::Expr {
} }
} }
} }
if let Some(target) = adj.unsize {
expr = Expr {
temp_lifetime: temp_lifetime,
ty: target,
span: self.span,
kind: ExprKind::Unsize { source: expr.to_ref() },
};
}
} }
} }