---

yaml
---
r: 31141
b: refs/heads/dist-snap
c: e8e143b
h: refs/heads/master
i:
  31139: 004754d
v: v3

Author: catamorphism

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: dac4916cec14751f27898d09ab9dcf3db9f30ad5
+refs/heads/dist-snap: e8e143b9d794f61aad664fb2d141304e6f640792
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/test/pretty/block-arg-disambig.rs

@@ -1,5 +1,5 @@
 // FIXME: The disambiguation the pretty printer does here
-// is probably not necessary anymore
+// is probably not necessary anymore (#2882)
 
 fn blk1(b: fn()) -> fn@() { ret fn@() { }; }
 fn test1() { (do blk1 { #debug["hi"]; })(); }

branches/dist-snap/src/test/run-pass/class-separate-impl.rs

@@ -1,6 +1,6 @@
 // xfail-test
 // xfail-fast
-// (Not sure why, though -- FIXME (tjc)
+// (Not sure why, though -- FIXME #2883)
 import to_str::*;
 import to_str::to_str;
 

branches/dist-snap/src/test/run-pass/issue-2718.rs

@@ -67,8 +67,6 @@ mod pipes {
           }
           full { fail "duplicate send" }
           blocked {
-            // FIXME: once the target will actually block, tell the
-            // scheduler to wake it up.
 
             // The receiver will eventually clean this up.
             unsafe { forget(p); }