Skip to content

Commit bea251c

Browse files
committed
---
yaml --- r: 151476 b: refs/heads/try2 c: dc30c48 h: refs/heads/master v: v3
1 parent 59759ea commit bea251c

File tree

3 files changed

+41
-27
lines changed

3 files changed

+41
-27
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: f582150159865b62b84b8a54d298af4c1b87800d
8+
refs/heads/try2: dc30c483810ca0ee3641f4bab8e6f2a44a883fee
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/slice.rs

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1368,6 +1368,42 @@ mod tests {
13681368
}
13691369
}
13701370

1371+
#[test]
1372+
fn test_partition() {
1373+
assert_eq!((box []).partition(|x: &int| *x < 3), (vec![], vec![]));
1374+
assert_eq!((box [1, 2, 3]).partition(|x: &int| *x < 4), (vec![1, 2, 3], vec![]));
1375+
assert_eq!((box [1, 2, 3]).partition(|x: &int| *x < 2), (vec![1], vec![2, 3]));
1376+
assert_eq!((box [1, 2, 3]).partition(|x: &int| *x < 0), (vec![], vec![1, 2, 3]));
1377+
}
1378+
1379+
#[test]
1380+
fn test_partitioned() {
1381+
assert_eq!(([]).partitioned(|x: &int| *x < 3), (vec![], vec![]));
1382+
assert_eq!(([1, 2, 3]).partitioned(|x: &int| *x < 4), (vec![1, 2, 3], vec![]));
1383+
assert_eq!(([1, 2, 3]).partitioned(|x: &int| *x < 2), (vec![1], vec![2, 3]));
1384+
assert_eq!(([1, 2, 3]).partitioned(|x: &int| *x < 0), (vec![], vec![1, 2, 3]));
1385+
}
1386+
1387+
#[test]
1388+
fn test_concat() {
1389+
let v: [~[int], ..0] = [];
1390+
assert_eq!(v.concat_vec(), vec![]);
1391+
assert_eq!([box [1], box [2,3]].concat_vec(), vec![1, 2, 3]);
1392+
1393+
assert_eq!([&[1], &[2,3]].concat_vec(), vec![1, 2, 3]);
1394+
}
1395+
1396+
#[test]
1397+
fn test_connect() {
1398+
let v: [~[int], ..0] = [];
1399+
assert_eq!(v.connect_vec(&0), vec![]);
1400+
assert_eq!([box [1], box [2, 3]].connect_vec(&0), vec![1, 0, 2, 3]);
1401+
assert_eq!([box [1], box [2], box [3]].connect_vec(&0), vec![1, 0, 2, 0, 3]);
1402+
1403+
assert_eq!([&[1], &[2, 3]].connect_vec(&0), vec![1, 0, 2, 3]);
1404+
assert_eq!([&[1], &[2], &[3]].connect_vec(&0), vec![1, 0, 2, 0, 3]);
1405+
}
1406+
13711407
#[test]
13721408
fn test_shift() {
13731409
let mut x = vec![1, 2, 3];

branches/try2/src/libstd/vec.rs

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1755,32 +1755,10 @@ mod tests {
17551755

17561756
#[test]
17571757
fn test_partitioned() {
1758-
assert_eq!(([]).partitioned(|x: &int| *x < 3), (vec![], vec![]))
1759-
assert_eq!(([1, 2, 3]).partitioned(|x: &int| *x < 4), (vec![1, 2, 3], vec![]));
1760-
assert_eq!(([1, 2, 3]).partitioned(|x: &int| *x < 2), (vec![1], vec![2, 3]));
1761-
assert_eq!(([1, 2, 3]).partitioned(|x: &int| *x < 0), (vec![], vec![1, 2, 3]));
1762-
}
1763-
1764-
#[test]
1765-
fn test_concat() {
1766-
let v: [Vec<int>, ..0] = [];
1767-
assert_eq!(v.concat_vec(), vec![]);
1768-
assert_eq!([vec![1], vec![2,3]].concat_vec(), vec![1, 2, 3]);
1769-
1770-
assert_eq!([&[1], &[2,3]].concat_vec(), vec![1, 2, 3]);
1771-
}
1772-
1773-
#[test]
1774-
fn test_connect() {
1775-
let v: [~[int], ..0] = [];
1776-
assert_eq!(v.connect_vec(&0), vec![]);
1777-
assert_eq!([vec![1], vec![2, 3]].connect_vec(&0), vec![1, 0, 2, 3]);
1778-
assert_eq!([vec![1], vec![2], vec![3]].connect_vec(&0), vec![1, 0, 2, 0, 3]);
1779-
1780-
let v: [&[int], ..0] = [];
1781-
assert_eq!(v.connect_vec(&0), vec![]);
1782-
assert_eq!([&[1], &[2, 3]].connect_vec(&0), vec![1, 0, 2, 3]);
1783-
assert_eq!([&[1], &[2], &[3]].connect_vec(&0), vec![1, 0, 2, 0, 3]);
1758+
assert_eq!(vec![].partitioned(|x: &int| *x < 3), (vec![], vec![]))
1759+
assert_eq!(vec![1, 2, 3].partitioned(|x: &int| *x < 4), (vec![1, 2, 3], vec![]));
1760+
assert_eq!(vec![1, 2, 3].partitioned(|x: &int| *x < 2), (vec![1], vec![2, 3]));
1761+
assert_eq!(vec![1, 2, 3].partitioned(|x: &int| *x < 0), (vec![], vec![1, 2, 3]));
17841762
}
17851763

17861764
#[test]

0 commit comments

Comments
 (0)