---

yaml
---
r: 11726
b: refs/heads/master
c: 92ed73d
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c40bfec45dee4957a56c4d6dd5bad21c91b40b5c
+refs/heads/master: 92ed73d0bd0a5d0871658c379a3f547d08f42b95
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

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

@@ -313,6 +313,14 @@ fn print_native_mod(s: ps, nmod: ast::native_mod, attrs: [ast::attribute]) {
     for item: @ast::native_item in nmod.items { print_native_item(s, item); }
 }
 
+fn print_region(s: ps, region: ast::region) {
+    alt region {
+      ast::re_inferred { /* no-op */ }
+      ast::re_named(name) { word(s.s, name); word(s.s, "."); }
+      ast::re_self { word(s.s, "self"); word(s.s, "."); }
+    }
+}
+
 fn print_type(s: ps, &&ty: @ast::ty) {
     maybe_print_comment(s, ty.span.lo);
     ibox(s, 0u);
@@ -332,7 +340,11 @@ fn print_type(s: ps, &&ty: @ast::ty) {
         word(s.s, "]");
       }
       ast::ty_ptr(mt) { word(s.s, "*"); print_mt(s, mt); }
-      ast::ty_rptr(region, mt) { fail "TODO"; }
+      ast::ty_rptr(region, mt) {
+        word(s.s, "&");
+        print_region(s, region);
+        print_mt(s, mt);
+      }
       ast::ty_rec(fields) {
         word(s.s, "{");
         fn print_field(s: ps, f: ast::ty_field) {
@@ -878,6 +890,7 @@ fn print_expr(s: ps, &&expr: @ast::expr) {
         print_op_maybe_parens(s, expr, parse::parser::unop_prec);
       }
       ast::expr_addr_of(m, expr) {
+        word(s.s, "&");
         print_mutability(s, m);
         print_expr(s, expr);
       }

trunk/src/test/run-pass/simple-regions.rs

@@ -1,11 +1,9 @@
-// xfail-pretty
-
 fn main() {
-    unsafe {
-        let x : int = 3;
-        let y : &mut int = &mut x;
+    unsafe{
+        let x: int = 3;
+        let y: &mutable int = &mutable x;
         *y = 5;
-        log(debug, *y);
+        log (debug, *y);
     }
 }