---

yaml
---
r: 30452
b: refs/heads/incoming
c: 3c7cc9a
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: d6ceef95bae928dbaf6050c95939d39ac33e1725
+refs/heads/incoming: 3c7cc9a1b813f658e34dbb7d596e2b4ab9221e9e
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rustc/middle/trans/impl.rs

@@ -186,8 +186,11 @@ fn trans_static_method_callee(bcx: block,
                 bcx, mth_id, impl_did, callee_id, rcvr_origins);
 
             let FnData {llfn: lval} =
-                trans_fn_ref_with_vtables(bcx, mth_id, callee_id,
-                                          callee_substs, Some(callee_origins));
+                trans_fn_ref_with_vtables(bcx,
+                                          mth_id,
+                                          callee_id,
+                                          callee_substs,
+                                          Some(callee_origins));
 
             let callee_ty = node_id_type(bcx, callee_id);
             let llty = T_ptr(type_of_fn_from_ty(ccx, callee_ty));

branches/incoming/src/rustc/middle/typeck/check/vtable.rs

@@ -400,7 +400,8 @@ fn connect_trait_tps(fcx: @fn_ctxt, expr: @ast::expr, impl_tys: ~[ty::t],
     }
 }
 
-fn insert_vtables(ccx: @crate_ctxt, callee_id: ast::node_id, vtables: vtable_res) {
+fn insert_vtables(ccx: @crate_ctxt, callee_id: ast::node_id,
+                  vtables: vtable_res) {
     debug!("insert_vtables(callee_id=%d, vtables=%?)",
            callee_id, vtables.map(|v| v.to_str(ccx.tcx)));
     ccx.vtable_map.insert(callee_id, vtables);