Pretty-print kinds of type params

brson · brson · commit 0b7a94a94c15 · 2011-08-03T10:55:59.000-07:00
diff --git a/src/comp/syntax/print/pprust.rs b/src/comp/syntax/print/pprust.rs
@@ -1195,10 +1195,19 @@ fn print_alias(s: &ps, m: ast::mode) {
     }
 }
 
+fn print_kind(s: &ps, kind: ast::kind) {
+    alt kind {
+      ast::kind_unique. { word(s.s, "~"); }
+      ast::kind_shared. { word(s.s, "@"); }
+      _ { /* fallthrough */ }
+    }
+}
+
 fn print_type_params(s: &ps, params: &ast::ty_param[]) {
     if ivec::len(params) > 0u {
         word(s.s, "[");
         fn printParam(s: &ps, param: &ast::ty_param) {
+            print_kind(s, param.kind);
             word(s.s, param.ident);
         }
         commasep(s, inconsistent, params, printParam);
diff --git a/src/test/run-pass/swap-2.rs b/src/test/run-pass/swap-2.rs
@@ -1,5 +1,3 @@
-// xfail-pretty
-
 fn swap[@T](v: &vec[mutable T], i: int, j: int) { v.(i) <-> v.(j); }
 
 fn main() {

Original file line number	Diff line number	Diff line change
`@@ -1195,10 +1195,19 @@ fn print_alias(s: &ps, m: ast::mode) {`
`1195`	`1195`	`}`
`1196`	`1196`	`}`
`1197`	`1197`
	`1198`	`+fn print_kind(s: &ps, kind: ast::kind) {`
	`1199`	`+ alt kind {`
	`1200`	`+ ast::kind_unique. { word(s.s, "~"); }`
	`1201`	`+ ast::kind_shared. { word(s.s, "@"); }`
	`1202`	`+ _ { /* fallthrough */ }`
	`1203`	`+ }`
	`1204`	`+}`
	`1205`	`+`
`1198`	`1206`	`fn print_type_params(s: &ps, params: &ast::ty_param[]) {`
`1199`	`1207`	`if ivec::len(params) > 0u {`
`1200`	`1208`	`word(s.s, "[");`
`1201`	`1209`	`fn printParam(s: &ps, param: &ast::ty_param) {`
	`1210`	`+ print_kind(s, param.kind);`
`1202`	`1211`	`word(s.s, param.ident);`
`1203`	`1212`	`}`
`1204`	`1213`	`commasep(s, inconsistent, params, printParam);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// xfail-pretty`
`2`		`-`
`3`	`1`	`fn swap[@T](v: &vec[mutable T], i: int, j: int) { v.(i) <-> v.(j); }`
`4`	`2`
`5`	`3`	`fn main() {`