Skip to content

Commit f373d3c

Browse files
committed
---
yaml --- r: 63607 b: refs/heads/snap-stage3 c: ba3f43e h: refs/heads/master i: 63605: 92ac46b 63603: 7f45220 63599: 6cc6d90 v: v3
1 parent 0c2dbb2 commit f373d3c

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 1d2b20ee2c4b6a0f71a4c2f85e4b10157d616c0f
4+
refs/heads/snap-stage3: ba3f43e506de97109788e4a96df438b3c89f5e49
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/util/ppaux.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,9 @@ pub fn ty_to_str(cx: ctxt, typ: t) -> ~str {
365365

366366
s.push_str("fn");
367367

368+
if !cty.bounds.is_empty() {
369+
s.push_str(":");
370+
}
368371
s.push_str(cty.bounds.repr(cx));
369372

370373
push_sig_to_str(cx, &mut s, &cty.sig);
@@ -457,9 +460,10 @@ pub fn ty_to_str(cx: ctxt, typ: t) -> ~str {
457460
let path = ty::item_path(cx, did);
458461
let base = ast_map::path_to_str(path, cx.sess.intr());
459462
let ty = parameterized(cx, base, substs.self_r, substs.tps);
463+
let bound_sep = if bounds.is_empty() { "" } else { ":" };
460464
let bound_str = bounds.repr(cx);
461-
fmt!("%s%s%s%s", trait_store_to_str(cx, s), mutability_to_str(mutbl), ty,
462-
bound_str)
465+
fmt!("%s%s%s%s%s", trait_store_to_str(cx, s), mutability_to_str(mutbl), ty,
466+
bound_sep, bound_str)
463467
}
464468
ty_evec(ref mt, vs) => {
465469
vstore_ty_to_str(cx, mt, vs)

0 commit comments

Comments
 (0)