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

normalize associated types in both self_ty and self_arg_ty

Browse source 
I was only doing it for self_arg_ty, and ended up causing
run-pass/associated-types-projection-from-known-type-in-impl.rs to fail.
This commit is contained in:
Michael Hewson 2017-11-08 08:24:33 -05:00
parent 3902643c27
commit 236974619f
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/librustc_typeck/check/wfcheck.rs
View file

@ -469,10 +469,22 @@ impl<'a, 'gcx> CheckTypeWellFormedVisitor<'a, 'gcx> {
debug!("check_method_receiver: sig={:?}", sig); debug!("check_method_receiver: sig={:?}", sig);
let self_ty = fcx.normalize_associated_types_in(span, &self_ty);
let self_ty = fcx.liberate_late_bound_regions(
method.def_id,
&ty::Binder(self_ty)
);
let self_arg_ty = sig.inputs()[0]; let self_arg_ty = sig.inputs()[0];
let cause = fcx.cause(span, ObligationCauseCode::MethodReceiver); let cause = fcx.cause(span, ObligationCauseCode::MethodReceiver);
let eq = |expected, actual| fcx.at(&cause, fcx.param_env).eq(expected, actual); let eq = |expected, actual| fcx.at(&cause, fcx.param_env).eq(expected, actual);
let self_arg_ty = fcx.normalize_associated_types_in(span, &self_arg_ty);
let self_arg_ty = fcx.liberate_late_bound_regions(
method.def_id,
&ty::Binder(self_arg_ty)
);
let mut autoderef = fcx.autoderef(span, self_arg_ty); let mut autoderef = fcx.autoderef(span, self_arg_ty);
loop { loop {
@ -484,7 +496,6 @@ impl<'a, 'gcx> CheckTypeWellFormedVisitor<'a, 'gcx> {
autoderef.finalize(); autoderef.finalize();
break break
} }
} else { } else {
fcx.tcx.sess.diagnostic().mut_span_err(span, &format!("invalid `self` type: {:?}", self_arg_ty)) fcx.tcx.sess.diagnostic().mut_span_err(span, &format!("invalid `self` type: {:?}", self_arg_ty))
.note(&format!("type must be `{:?}` or a type that dereferences to it`", self_ty)) .note(&format!("type must be `{:?}` or a type that dereferences to it`", self_ty))