Skip to content

Commit 2ff0dc4

Browse files
committed
---
yaml --- r: 7069 b: refs/heads/master c: 41a2d84 h: refs/heads/master i: 7067: ad596df v: v3
1 parent fed2bc7 commit 2ff0dc4

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

[refs]

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 7c1f683c6d93cdb5fee8a664cd6b5ff2397e1d04
2+
refs/heads/master: 41a2d8495e3784a03871b69d686f4937c8396707

trunk/src/comp/syntax/print/pprust.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ fn print_type(s: ps, &&ty: @ast::ty) {
306306
pclose(s);
307307
}
308308
ast::ty_fn(proto, d) {
309-
print_ty_fn(s, proto, d, none::<str>);
309+
print_ty_fn(s, proto, d, none, none);
310310
}
311311
ast::ty_obj(methods) {
312312
head(s, "obj");
@@ -519,7 +519,7 @@ fn print_ty_method(s: ps, m: ast::ty_method) {
519519
hardbreak_if_not_bol(s);
520520
cbox(s, indent_unit);
521521
maybe_print_comment(s, m.span.lo);
522-
print_ty_fn(s, ast::proto_bare, m.decl, some(m.ident));
522+
print_ty_fn(s, ast::proto_bare, m.decl, some(m.ident), some(m.tps));
523523
word(s.s, ";");
524524
end(s);
525525
}
@@ -1399,10 +1399,12 @@ fn print_mt(s: ps, mt: ast::mt) {
13991399
}
14001400

14011401
fn print_ty_fn(s: ps, proto: ast::proto,
1402-
decl: ast::fn_decl, id: option::t<ast::ident>) {
1402+
decl: ast::fn_decl, id: option::t<ast::ident>,
1403+
tps: option::t<[ast::ty_param]>) {
14031404
ibox(s, indent_unit);
14041405
word(s.s, proto_to_str(proto));
14051406
alt id { some(id) { word(s.s, " "); word(s.s, id); } _ { } }
1407+
alt tps { some(tps) { print_type_params(s, tps); } _ { } }
14061408
zerobreak(s.s);
14071409
popen(s);
14081410
fn print_arg(s: ps, input: ast::arg) {

trunk/src/test/run-pass/iface-generic.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// xfail-pretty
2-
31
iface to_str {
42
fn to_str() -> str;
53
}

0 commit comments

Comments
 (0)