---

yaml
---
r: 163657
b: refs/heads/snap-stage3
c: ebf1e4f
h: refs/heads/master
i:
  163655: b9a9240
v: v3

Author: nikomatsakis

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 9146a919b616e39e528e4d7100d16eef52f1f852
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: a04ce71172d8b51aa0d7df288bfd7333e39c763a
+refs/heads/snap-stage3: ebf1e4f23adba8fc2a4441b8c2a7473c3a7c9d65
 refs/heads/try: 20cbbffeefc1f35e2ea63afce7b42fbd79611d42
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/test/compile-fail/issue-15965.rs

@@ -10,7 +10,10 @@
 
 fn main() {
     return
-        { return () } //~ ERROR the type of this value must be known in this context
+        { return () }
+//~^ ERROR the type of this value must be known in this context
+//~| ERROR this function takes 1 parameter
+//~| ERROR mismatched types
     ()
     ;
 }

branches/snap-stage3/src/test/compile-fail/issue-18345.rs

@@ -13,7 +13,9 @@ type Transducer<'t, R, T, U> = |Step<'t, R, U>|: 't -> Step<'t, R, T>;
 
 fn mapping<'f, R, T, U>(f: |T|: 'f -> U) -> &'f Transducer<'f, R, T, U> {
     |step| |r, x|
-        step(r, f(x)) //~ ERROR the type of this value must be known in this context
+        step(r, f(x))
+        //~^ ERROR the type of this value must be known in this context
+        //~| ERROR this function takes 1 parameter but 2 parameters were supplied
 }
 
 fn main() {}

branches/snap-stage3/src/test/compile-fail/issue-18532.rs

@@ -17,4 +17,5 @@
 fn main() {
     (return)((),());
     //~^ ERROR the type of this value must be known
+    //~| ERROR this function takes 1 parameter
 }