Skip to content

Commit c16d587

Browse files
committed
---
yaml --- r: 32423 b: refs/heads/dist-snap c: 55bd6ce h: refs/heads/master i: 32421: 61ae139 32419: 37eb521 32415: 5d84939 v: v3
1 parent bf8f144 commit c16d587

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
@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
10-
refs/heads/dist-snap: b4e547d71aa379e702a737550e479116914b19cf
10+
refs/heads/dist-snap: 55bd6cee2ff9123c68d7361e235ac99927f4b062
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/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)