---

yaml
---
r: 39219
b: refs/heads/incoming
c: 1fc8022
h: refs/heads/master
i:
  39217: ebaee34
  39215: d22cd9f
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 4f3cc01487ff4c49f6a72725ae47533da06835db
+refs/heads/incoming: 1fc802233b8b8a722fa9bbd5e1cccd0a0fd417f3
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/middle/trans/inline.rs

@@ -86,7 +86,8 @@ fn maybe_instantiate_inline(ccx: @crate_ctxt, fn_id: ast::def_id,
                 let self_kind = match mth.self_ty.node {
                     ast::sty_static => no_self,
                     _ => {
-                        let self_ty = ty::node_id_to_type(ccx.tcx, mth.self_id);
+                        let self_ty = ty::node_id_to_type(ccx.tcx,
+                                                          mth.self_id);
                         debug!("calling inline trans_fn with self_ty %s",
                                ty_to_str(ccx.tcx, self_ty));
                         match mth.self_ty.node {