Skip to content

Commit b488386

Browse files
committed
---
yaml --- r: 36554 b: refs/heads/try2 c: 1fc8022 h: refs/heads/master v: v3
1 parent e0a6ea4 commit b488386

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 4f3cc01487ff4c49f6a72725ae47533da06835db
8+
refs/heads/try2: 1fc802233b8b8a722fa9bbd5e1cccd0a0fd417f3
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ fn maybe_instantiate_inline(ccx: @crate_ctxt, fn_id: ast::def_id,
8686
let self_kind = match mth.self_ty.node {
8787
ast::sty_static => no_self,
8888
_ => {
89-
let self_ty = ty::node_id_to_type(ccx.tcx, mth.self_id);
89+
let self_ty = ty::node_id_to_type(ccx.tcx,
90+
mth.self_id);
9091
debug!("calling inline trans_fn with self_ty %s",
9192
ty_to_str(ccx.tcx, self_ty));
9293
match mth.self_ty.node {

0 commit comments

Comments
 (0)