File tree Expand file tree Collapse file tree 2 files changed +12
-2
lines changed Expand file tree Collapse file tree 2 files changed +12
-2
lines changed Original file line number Diff line number Diff line change 1
1
---
2
- refs/heads/master: fee88f79f5d78de8bbebec6cfc4b04335fb597b6
2
+ refs/heads/master: 35e021ed53d3ab9e63686ec7d79bc3ca2af0c820
Original file line number Diff line number Diff line change @@ -858,6 +858,15 @@ mod Unify {
858
858
}
859
859
}
860
860
}
861
+
862
+ // TODO: "freeze"
863
+ let vec[ @ty. t] param_substs_1 = vec ( ) ;
864
+ for ( @ty. t subst in param_substs) {
865
+ param_substs_1 += vec ( subst) ;
866
+ }
867
+
868
+ unified_type =
869
+ ty. substitute_type_params ( param_substs_1, unified_type) ;
861
870
fcx. locals . insert ( id, unified_type) ;
862
871
}
863
872
fn record_param ( uint index , @ty. t binding ) -> ty. unify_result {
@@ -1617,7 +1626,8 @@ fn check_pat(&@fn_ctxt fcx, @ast.pat pat) -> @ast.pat {
1617
1626
}
1618
1627
1619
1628
fn check_expr( & @fn_ctxt fcx, @ast. expr expr) -> @ast. expr {
1620
- // log "typechecking expr " + pretty.pprust.expr_to_str(expr);
1629
+ //fcx.ccx.sess.span_warn(expr.span, "typechecking expr " +
1630
+ // pretty.pprust.expr_to_str(expr));
1621
1631
1622
1632
// A generic function to factor out common logic from call and bind
1623
1633
// expressions.
You can’t perform that action at this time.
0 commit comments