@@ -6510,7 +6510,7 @@ fn trans_anon_obj(@block_ctxt bcx, &span sp, &ast::anon_obj anon_obj,
6510
6510
case ( some( ?fields) ) {
6511
6511
additional_fields = fields;
6512
6512
for ( ast:: anon_obj_field f in fields) {
6513
- additional_field_tys += [ node_ann_type ( ccx, f. ann ) ] ;
6513
+ additional_field_tys += [ node_id_type ( ccx, f. id ) ] ;
6514
6514
additional_field_vals += [ trans_expr( bcx, f. expr) ] ;
6515
6515
}
6516
6516
}
@@ -6526,7 +6526,7 @@ fn trans_anon_obj(@block_ctxt bcx, &span sp, &ast::anon_obj anon_obj,
6526
6526
// Translating with_obj returns a ValueRef (pointer to a 2-word
6527
6527
// value) wrapped in a result.
6528
6528
with_obj_val = some[ result] ( trans_expr( bcx, e) ) ;
6529
- with_obj_ty = node_ann_type ( ccx , ty:: expr_ann ( e ) ) ;
6529
+ with_obj_ty = ty:: expr_ty ( ccx . tcx , e ) ;
6530
6530
}
6531
6531
}
6532
6532
// FIXME (part of issue #538): much of the following code is copypasta
@@ -6552,7 +6552,7 @@ fn trans_anon_obj(@block_ctxt bcx, &span sp, &ast::anon_obj anon_obj,
6552
6552
// and all we have is an ast::anon_obj, so we need to roll our own.
6553
6553
6554
6554
fn anon_obj_field_to_obj_field( & ast:: anon_obj_field f) -> ast:: obj_field {
6555
- ret rec( mut =f. mut , ty=f. ty, ident=f. ident, id=f. id, ann=f . ann ) ;
6555
+ ret rec( mut =f. mut , ty=f. ty, ident=f. ident, id=f. id) ;
6556
6556
}
6557
6557
let ast:: _obj wrapper_obj = rec(
6558
6558
fields = vec:: map( anon_obj_field_to_obj_field, additional_fields) ,
0 commit comments