---

yaml
---
r: 22894
b: refs/heads/master
c: d747cd7
h: refs/heads/master
v: v3

Author: lkuper

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 91bd2910090aa5f80fd3ff401e891aa19286a474
+refs/heads/master: d747cd724ed3cf19d3daf8a46f7726db888da844
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rustc/middle/typeck/collect.rs

@@ -278,10 +278,10 @@ fn check_methods_against_trait(ccx: @crate_ctxt,
     } // |if_m|
 } // fn
 
-fn convert_class_item(ccx: @crate_ctxt,
-                      rp: bool,
-                      bounds: @~[ty::param_bounds],
-                      v: ast_util::ivar) {
+fn convert_field(ccx: @crate_ctxt,
+                 rp: bool,
+                 bounds: @~[ty::param_bounds],
+                 v: ast_util::ivar) {
     let tt = ccx.to_ty(type_rscope(rp), v.ty);
     write_ty_to_tcx(ccx.tcx, v.id, tt);
     /* add the field to the tcache */
@@ -391,7 +391,7 @@ fn convert(ccx: @crate_ctxt, it: @ast::item) {
         // Write the type of each of the members
         let (fields, methods) = split_class_items(members);
         for fields.each |f| {
-           convert_class_item(ccx, rp, tpt.bounds, f);
+           convert_field(ccx, rp, tpt.bounds, f);
         }
         let {bounds, substs} = mk_substs(ccx, tps, rp);
         let selfty = ty::mk_class(tcx, local_def(it.id), substs);