---

yaml
---
r: 164630
b: refs/heads/auto
c: ebf1e4f
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: a04ce71172d8b51aa0d7df288bfd7333e39c763a
+refs/heads/auto: ebf1e4f23adba8fc2a4441b8c2a7473c3a7c9d65
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/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/auto/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/auto/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
 }