---

yaml
---
r: 42742
b: refs/heads/try
c: 3b36708
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
-refs/heads/try: 58ec84a098376860c2126389938b340fbb810d78
+refs/heads/try: 3b36708ca78f82d226d53ed66b1878f482ced468
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/test/pretty/block-disambig.rs

@@ -16,8 +16,10 @@ fn test1() { let val = @0; { } *val; }
 
 fn test2() -> int { let val = @0; { } *val }
 
+struct S { mut eax: int }
+
 fn test3() {
-    let regs = @{mut eax: 0};
+    let regs = @S {mut eax: 0};
     match true { true => { } _ => { } }
     (*regs).eax = 1;
 }

branches/try/src/test/pretty/record-trailing-comma.rs

@@ -8,11 +8,17 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// NOTE this is a pretty-printer bug that I fixed, but it's
+// not in the snapshot yet. After a new snapshot, can un-xfail
+// xfail-pretty
 // pp-exact
-type thing = {x: int, y: int,};
+struct Thing {
+    x: int,
+    y: int,
+}
 
 fn main() {
-    let sth = {x: 0, y: 1,};
-    let sth2 = {y: 9, ..sth};
+    let sth = Thing{x: 0, y: 1,};
+    let sth2 = Thing{y: 9 , ..sth};
     assert sth.x + sth2.y == 9;
 }