auto merge of #6972 : artagnon/rust/bad-for-loop, r=bstrie

I noticed this while reading the tutorial.

[1/2] adds tests to guard against regressions.
[2/2] corrects the tutorial.

Please let me know if you have a standard place to put tests: they seem to be all over the place currently.

2 files changed, 19 insertions, 3 deletions

diff --git a/src/test/compile-fail/bad-for-loop-2.rs b/src/test/compile-fail/bad-for-loop-2.rs
new file mode 100644
index 00000000000..4f90ff5802d
--- /dev/null
+++ b/src/test/compile-fail/bad-for-loop-2.rs
@@ -0,0 +1,15 @@
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+fn main() {
+    fn quux(_: &fn(&int) -> bool) -> () { }
+    for quux |_| { } //~ ERROR expected `for` closure to return
+                     // `bool`, but found `()`
+}
diff --git a/src/test/compile-fail/bad-for-loop.rs b/src/test/compile-fail/bad-for-loop.rs
index 7ff51eff8ee..83616b708f2 100644
--- a/src/test/compile-fail/bad-for-loop.rs
+++ b/src/test/compile-fail/bad-for-loop.rs
@@ -9,7 +9,8 @@
 // except according to those terms.
 
 fn main() {
-    fn baz(_x: &fn(y: int) -> int) {}
-    for baz |_e| { } //~ ERROR A `for` loop iterator should expect a closure that returns `bool`
-                     //~^ ERROR expected `for` closure to return `bool`
+    fn quux(_: &fn(&int) -> int) -> bool { true }
+    for quux |_| { } //~ ERROR A `for` loop iterator should expect a
+                     // closure that returns `bool`.  This iterator
+                     // expects a closure that returns `int`.
 }