@@ -473,14 +473,6 @@ mod write {
473
473
}
474
474
}
475
475
476
- // Determine the proto for a fn type given the proto for its associated
477
- // code. This is needed because fn and lambda have fn type while iter
478
- // has iter type and block has block type. This may end up changing.
479
- fn proto_to_ty_proto ( proto : ast:: proto ) -> ast:: proto {
480
- // FIXME: This is no longer needed since fn@ and lambda have
481
- // the same type
482
- proto
483
- }
484
476
485
477
// Item collection - a pair of bootstrap passes:
486
478
//
@@ -529,7 +521,7 @@ mod collect {
529
521
out_constrs += [ ty:: ast_constr_to_constr ( cx. tcx , constr) ] ;
530
522
}
531
523
let t_fn =
532
- ty:: mk_fn ( cx. tcx , proto_to_ty_proto ( proto) , input_tys, output_ty,
524
+ ty:: mk_fn ( cx. tcx , proto, input_tys, output_ty,
533
525
decl. cf , out_constrs) ;
534
526
let tpt = { kinds: ty_param_kinds ( ty_params) , ty: t_fn} ;
535
527
alt def_id { some( did) { cx. tcx . tcache . insert ( did, tpt) ; } _ { } }
@@ -584,7 +576,7 @@ mod collect {
584
576
for constr: @ast:: constr in m. node . meth . decl . constraints {
585
577
out_constrs += [ ty:: ast_constr_to_constr ( cx. tcx , constr) ] ;
586
578
}
587
- ret { proto : proto_to_ty_proto ( m. node . meth . proto ) ,
579
+ ret { proto : m. node . meth . proto ,
588
580
ident : m. node . ident ,
589
581
inputs : inputs,
590
582
output : output,
0 commit comments