Skip to content

Commit 26db404

Browse files
committed
---
yaml --- r: 21653 b: refs/heads/snap-stage3 c: 55bd6ce h: refs/heads/master i: 21651: 51f627f v: v3
1 parent 74db782 commit 26db404

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: b4e547d71aa379e702a737550e479116914b19cf
4+
refs/heads/snap-stage3: 55bd6cee2ff9123c68d7361e235ac99927f4b062
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/sort.rs

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,28 @@ mod tests {
307307
let v2 = merge_sort(le, v1);
308308
assert v2 == ~[1, 2, 3];
309309
}
310+
311+
#[test]
312+
fn test_merge_sort_stability()
313+
{
314+
// tjc: funny that we have to use parens
315+
pure fn ile(x: &(&static/str), y: &(&static/str)) -> bool
316+
{
317+
unchecked // to_lower is not pure...
318+
{
319+
let x = x.to_lower();
320+
let y = y.to_lower();
321+
x <= y
322+
}
323+
}
324+
325+
let names1 = ~["joe bob", "Joe Bob", "Jack Brown", "JOE Bob",
326+
"Sally Mae", "JOE BOB", "Alex Andy"];
327+
let names2 = ~["Alex Andy", "Jack Brown", "joe bob", "Joe Bob",
328+
"JOE Bob", "JOE BOB", "Sally Mae"];
329+
let names3 = merge_sort(ile, names1);
330+
assert names3 == names2;
331+
}
310332
}
311333

312334
// Local Variables:

0 commit comments

Comments
 (0)