Skip to content

Commit b964c42

Browse files
committed
---
yaml --- r: 73700 b: refs/heads/dist-snap c: 133d451 h: refs/heads/master v: v3
1 parent 729e30e commit b964c42

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
99
refs/heads/incoming: b50030718cf28f2a5a81857a26b57442734fe854
10-
refs/heads/dist-snap: af418f2fd5f9dbebbc786550df97658ec3bf0c65
10+
refs/heads/dist-snap: 133d45171564c8b7de14523c9f3aa87140b9f043
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1313
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libstd/vec.rs

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1564,7 +1564,7 @@ pub fn each<'r,T>(v: &'r [T], f: &fn(&'r T) -> bool) -> bool {
15641564
}
15651565
broke = n > 0;
15661566
}
1567-
return true;
1567+
return !broke;
15681568
}
15691569

15701570
/// 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 {
15861586
}
15871587
broke = n > 0;
15881588
}
1589-
return broke;
1589+
return !broke;
15901590
}
15911591

15921592
/// Like `each()`, but for the case where you have a vector that *may or may
@@ -3598,6 +3598,23 @@ mod tests {
35983598
}
35993599
}
36003600

3601+
#[test]
3602+
fn test_each_ret_len0() {
3603+
let mut a0 : [int, .. 0] = [];
3604+
assert_eq!(each(a0, |_p| fail!()), true);
3605+
assert_eq!(each_mut(a0, |_p| fail!()), true);
3606+
}
3607+
3608+
#[test]
3609+
fn test_each_ret_len1() {
3610+
let mut a1 = [17];
3611+
assert_eq!(each(a1, |_p| true), true);
3612+
assert_eq!(each_mut(a1, |_p| true), true);
3613+
assert_eq!(each(a1, |_p| false), false);
3614+
assert_eq!(each_mut(a1, |_p| false), false);
3615+
}
3616+
3617+
36013618
#[test]
36023619
fn test_each_permutation() {
36033620
let mut results: ~[~[int]];

0 commit comments

Comments
 (0)