@@ -582,20 +582,20 @@ mod collect {
582
582
inputs=inputs, output=output, cf=m. node. meth. decl. cf,
583
583
constrs=out_constrs) ;
584
584
}
585
- fn ty_of_obj( @ctxt cx, & ast:: ident id, & ast:: _obj obj_info ,
585
+ fn ty_of_obj( @ctxt cx, & ast:: ident id, & ast:: _obj ob ,
586
586
& ast:: ty_param[ ] ty_params) -> ty:: ty_param_count_and_ty {
587
- auto methods = get_obj_method_types( cx, obj_info ) ;
587
+ auto methods = get_obj_method_types( cx, ob ) ;
588
588
auto t_obj = ty:: mk_obj( cx. tcx, ty:: sort_methods( methods) ) ;
589
589
t_obj = ty:: rename( cx. tcx, t_obj, id) ;
590
590
ret tup( ivec:: len( ty_params) , t_obj) ;
591
591
}
592
- fn ty_of_obj_ctor( @ctxt cx, & ast:: ident id, & ast:: _obj obj_info ,
592
+ fn ty_of_obj_ctor( @ctxt cx, & ast:: ident id, & ast:: _obj ob ,
593
593
ast:: node_id ctor_id, & ast:: ty_param[ ] ty_params) ->
594
594
ty:: ty_param_count_and_ty {
595
- auto t_obj = ty_of_obj( cx, id, obj_info , ty_params) ;
595
+ auto t_obj = ty_of_obj( cx, id, ob , ty_params) ;
596
596
597
597
let arg[ ] t_inputs = ~[ ] ;
598
- for ( ast:: obj_field f in obj_info . fields) {
598
+ for ( ast:: obj_field f in ob . fields) {
599
599
auto g = bind getter( cx, _) ;
600
600
auto t_field = ast_ty_to_ty( cx. tcx, g, f. ty) ;
601
601
t_inputs += ~[ rec( mode=ty:: mo_alias( false) , ty=t_field) ] ;
0 commit comments