---

yaml
---
r: 3522
b: refs/heads/master
c: bf20fe5
h: refs/heads/master
v: v3

Author: marijnh

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b1b5d5a8a9aba6a682f95b7c738945be8e1fca2
+refs/heads/master: bf20fe557588563d8070869f5ebe187c7ba0ba9e

trunk/src/comp/pretty/ppaux.rs

@@ -139,6 +139,9 @@ fn ty_to_str(&ctxt cx, &t typ) -> str {
             auto m = vec::map[method, str](f, meths);
             s += "obj {\n\t" + str::connect(m, "\n\t") + "\n}";
         }
+        case (ty_res(?id, _, _)) {
+            s += "<resource#" + istr(id._0) + ":" + istr(id._1) + ">";
+        }
         case (ty_var(?v)) { s += "<T" + istr(v) + ">"; }
         case (ty_param(?id)) {
             s += "'" + str::unsafe_from_bytes([('a' as u8) + (id as u8)]);

trunk/src/comp/pretty/pprust.rs

@@ -442,7 +442,7 @@ fn print_item(&ps s, &@ast::item item) {
             bclose(s, item.span);
         }
         case (ast::item_res(?dt, ?dt_id, ?tps, ?ct_id)) {
-            head(s, "res");
+            head(s, "resource");
             word(s.s, item.ident);
             print_type_params(s, tps);
             popen(s);