Update to last master

This commit is contained in:
Guillaume Gomez 2016-12-06 15:32:30 -08:00
parent 64de44e0a1
commit b1dd793acd
1 changed files with 3 additions and 2 deletions

View File

@ -790,8 +790,9 @@ fn check_fn<'a, 'gcx, 'tcx>(inherited: &'a Inherited<'a, 'gcx, 'tcx>,
*fcx.ps.borrow_mut() = UnsafetyState::function(unsafety, unsafety_id);
fcx.require_type_is_sized(ret_ty, decl.output.span(), traits::ReturnType);
fcx.ret_ty = fcx.instantiate_anon_types(&ret_ty);
fn_sig = fcx.tcx.mk_fn_sig(fn_sig.inputs().iter().cloned(), &fcx.ret_ty, fn_sig.variadic);
fcx.ret_ty = fcx.instantiate_anon_types(&Some(ret_ty));
fn_sig = fcx.tcx.mk_fn_sig(fn_sig.inputs().iter().cloned(), &fcx.ret_ty.unwrap(),
fn_sig.variadic);
{
let mut visit = GatherLocalsVisitor { fcx: &fcx, };