mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

extract autoderef type adjustment code into a reusable

Browse source 
helper
This commit is contained in:
Niko Matsakis 2015-08-18 17:57:42 -04:00
parent 714f2a8921
commit 0e764ec5ce
1 changed files with 39 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/librustc/middle/ty.rs
View file

@ -5191,28 +5191,12 @@ impl<'tcx> TyS<'tcx> {
if !adjusted_ty.references_error() {
for i in 0..adj.autoderefs {
let method_call = MethodCall::autoderef(expr_id, i as u32);
match method_type(method_call) {
Some(method_ty) => {
// Overloaded deref operators have all late-bound
// regions fully instantiated and coverge.
let fn_ret =
cx.no_late_bound_regions(&method_ty.fn_ret()).unwrap();
adjusted_ty = fn_ret.unwrap();
}
None => {}
}
match adjusted_ty.builtin_deref(true, NoPreference) {
Some(mt) => { adjusted_ty = mt.ty; }
None => {
cx.sess.span_bug(
span,
&format!("the {}th autoderef failed: {}",
i,
adjusted_ty)
);
}
}
adjusted_ty =
adjusted_ty.adjust_for_autoderef(cx,
expr_id,
span,
i as u32,
&mut method_type);
}
}
@ -5228,6 +5212,39 @@ impl<'tcx> TyS<'tcx> {
};
}
pub fn adjust_for_autoderef<F>(&'tcx self,
cx: &ctxt<'tcx>,
expr_id: ast::NodeId,
expr_span: Span,
autoderef: u32, // how many autoderefs so far?
mut method_type: F)
-> Ty<'tcx> where
F: FnMut(MethodCall) -> Option<Ty<'tcx>>,
{
let method_call = MethodCall::autoderef(expr_id, autoderef);
let mut adjusted_ty = self;
match method_type(method_call) {
Some(method_ty) => {
// Method calls always have all late-bound regions
// fully instantiated.
let fn_ret = cx.no_late_bound_regions(&method_ty.fn_ret()).unwrap();
adjusted_ty = fn_ret.unwrap();
}
None => {}
}
match adjusted_ty.builtin_deref(true, NoPreference) {
Some(mt) => mt.ty,
None => {
cx.sess.span_bug(
expr_span,
&format!("the {}th autoderef failed: {}",
autoderef,
adjusted_ty)
);
}
}
}
pub fn adjust_for_autoref(&'tcx self, cx: &ctxt<'tcx>,
autoref: Option<AutoRef<'tcx>>)
-> Ty<'tcx> {