---

yaml
---
r: 100702
b: refs/heads/snap-stage3
c: 42cd820
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e3b1f3c443c048913e2d573fcc5a9c2be3484a78
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 95c53c049c9ced13c325c9aade22affbf5d97fa3
+refs/heads/snap-stage3: 42cd820c62c531f20d763281c7cc2bdaa1e0a89a
 refs/heads/try: a97642026c18a624ff6ea01075dd9550f8ed07ff
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

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

@@ -565,11 +565,26 @@ impl<T:Repr> Repr for Option<T> {
     fn repr(&self, tcx: ctxt) -> ~str {
         match self {
             &None => ~"None",
-            &Some(ref t) => format!("Some({})", t.repr(tcx))
+            &Some(ref t) => t.repr(tcx),
         }
     }
 }
 
+impl<T:Repr,U:Repr> Repr for Result<T,U> {
+    fn repr(&self, tcx: ctxt) -> ~str {
+        match self {
+            &Ok(ref t) => t.repr(tcx),
+            &Err(ref u) => format!("Err({})", u.repr(tcx))
+        }
+    }
+}
+
+impl Repr for () {
+    fn repr(&self, _tcx: ctxt) -> ~str {
+        ~"()"
+    }
+}
+
 impl<T:Repr> Repr for @T {
     fn repr(&self, tcx: ctxt) -> ~str {
         (&**self).repr(tcx)
@@ -1021,3 +1036,32 @@ impl UserString for AbiSet {
         self.to_str()
     }
 }
+
+impl Repr for ty::UpvarId {
+    fn repr(&self, tcx: ctxt) -> ~str {
+        format!("UpvarId({};`{}`;{})",
+             self.var_id,
+             ty::local_var_name_str(tcx, self.var_id),
+             self.closure_expr_id)
+    }
+}
+
+impl Repr for ast::Mutability {
+    fn repr(&self, _tcx: ctxt) -> ~str {
+        format!("{:?}", *self)
+    }
+}
+
+impl Repr for ty::BorrowKind {
+    fn repr(&self, _tcx: ctxt) -> ~str {
+        format!("{:?}", *self)
+    }
+}
+
+impl Repr for ty::UpvarBorrow {
+    fn repr(&self, tcx: ctxt) -> ~str {
+        format!("UpvarBorrow({}, {})",
+             self.kind.repr(tcx),
+             self.region.repr(tcx))
+    }
+}