File tree Expand file tree Collapse file tree 2 files changed +3
-5
lines changed Expand file tree Collapse file tree 2 files changed +3
-5
lines changed Original file line number Diff line number Diff line change 1
1
---
2
- refs/heads/master: 680e858d612fe9da436194dacdf2987ece9ada03
2
+ refs/heads/master: a6c6e8679e2a04624be710c00828bd59d1f4cc3b
Original file line number Diff line number Diff line change @@ -1767,7 +1767,7 @@ fn check_expr(&fn_ctxt fcx, @ast.expr expr) -> @ast.expr {
1767
1767
}
1768
1768
case ( ast. def_fn( ?id) ) {
1769
1769
check ( fcx. ccx. item_types. contains_key( id) ) ;
1770
- t = fcx. ccx. item_types. get( id) ;
1770
+ t = generalize_ty ( fcx. ccx, fcx . ccx . item_types. get( id) ) ;
1771
1771
}
1772
1772
case ( ast. def_const( ?id) ) {
1773
1773
check ( fcx. ccx. item_types. contains_key( id) ) ;
@@ -1783,7 +1783,7 @@ fn check_expr(&fn_ctxt fcx, @ast.expr expr) -> @ast.expr {
1783
1783
}
1784
1784
case ( ast. def_obj( ?id) ) {
1785
1785
check ( fcx. ccx. item_types. contains_key( id) ) ;
1786
- t = fcx. ccx. item_types. get( id) ;
1786
+ t = generalize_ty ( fcx. ccx, fcx . ccx . item_types. get( id) ) ;
1787
1787
}
1788
1788
1789
1789
case ( _) {
@@ -1794,8 +1794,6 @@ fn check_expr(&fn_ctxt fcx, @ast.expr expr) -> @ast.expr {
1794
1794
}
1795
1795
}
1796
1796
1797
- t = generalize_ty( fcx. ccx, t) ;
1798
-
1799
1797
ret @fold. respan[ ast. expr_] ( expr. span,
1800
1798
ast. expr_name( name, defopt,
1801
1799
ast. ann_type( t) ) ) ;
You can’t perform that action at this time.
0 commit comments