Skip to content

Commit 7d49035

Browse files
committed
Don't use 'obj_info' as an identifier for things not of type obj_info.
1 parent 7e55061 commit 7d49035

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/comp/middle/typeck.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -582,20 +582,20 @@ mod collect {
582582
inputs=inputs, output=output, cf=m.node.meth.decl.cf,
583583
constrs=out_constrs);
584584
}
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,
586586
&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);
588588
auto t_obj = ty::mk_obj(cx.tcx, ty::sort_methods(methods));
589589
t_obj = ty::rename(cx.tcx, t_obj, id);
590590
ret tup(ivec::len(ty_params), t_obj);
591591
}
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,
593593
ast::node_id ctor_id, &ast::ty_param[] ty_params) ->
594594
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);
596596

597597
let arg[] t_inputs = ~[];
598-
for (ast::obj_field f in obj_info.fields) {
598+
for (ast::obj_field f in ob.fields) {
599599
auto g = bind getter(cx, _);
600600
auto t_field = ast_ty_to_ty(cx.tcx, g, f.ty);
601601
t_inputs += ~[rec(mode=ty::mo_alias(false), ty=t_field)];

0 commit comments

Comments
 (0)