auto merge of #6886 : jld/rust/vec-each-ret-fix, r=sanxiyn

1 files changed, 19 insertions, 2 deletions

diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs
index 255dc1c95f7..9aeee4ba7b7 100644
--- a/src/libstd/vec.rs
+++ b/src/libstd/vec.rs
@@ -1564,7 +1564,7 @@ pub fn each<'r,T>(v: &'r [T], f: &fn(&'r T) -> bool) -> bool {
         }
         broke = n > 0;
     }
-    return true;
+    return !broke;
 }
 
 /// Like `each()`, but for the case where you have
@@ -1586,7 +1586,7 @@ pub fn each_mut<'r,T>(v: &'r mut [T], f: &fn(elem: &'r mut T) -> bool) -> bool {
         }
         broke = n > 0;
     }
-    return broke;
+    return !broke;
 }
 
 /// Like `each()`, but for the case where you have a vector that *may or may
@@ -3599,6 +3599,23 @@ mod tests {
     }
 
     #[test]
+    fn test_each_ret_len0() {
+        let mut a0 : [int, .. 0] = [];
+        assert_eq!(each(a0, |_p| fail!()), true);
+        assert_eq!(each_mut(a0, |_p| fail!()), true);
+    }
+
+    #[test]
+    fn test_each_ret_len1() {
+        let mut a1 = [17];
+        assert_eq!(each(a1, |_p| true), true);
+        assert_eq!(each_mut(a1, |_p| true), true);
+        assert_eq!(each(a1, |_p| false), false);
+        assert_eq!(each_mut(a1, |_p| false), false);
+    }
+
+
+    #[test]
     fn test_each_permutation() {
         let mut results: ~[~[int]];