---

yaml
---
r: 30361
b: refs/heads/incoming
c: 55bd6ce
h: refs/heads/master
i:
  30359: ad27695
v: v3

Author: catamorphism

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: b4e547d71aa379e702a737550e479116914b19cf
+refs/heads/incoming: 55bd6cee2ff9123c68d7361e235ac99927f4b062
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libstd/sort.rs

@@ -307,6 +307,28 @@ mod tests {
         let v2 = merge_sort(le, v1);
         assert v2 == ~[1, 2, 3];
     }
+
+    #[test]
+    fn test_merge_sort_stability()
+    {
+        // tjc: funny that we have to use parens
+        pure fn ile(x: &(&static/str), y: &(&static/str)) -> bool
+        {
+            unchecked            // to_lower is not pure...
+            {
+                let x = x.to_lower();
+                let y = y.to_lower();
+                x <= y
+            }
+        }
+
+        let names1 = ~["joe bob", "Joe Bob", "Jack Brown", "JOE Bob",
+                       "Sally Mae", "JOE BOB", "Alex Andy"];
+        let names2 = ~["Alex Andy", "Jack Brown", "joe bob", "Joe Bob",
+                       "JOE Bob", "JOE BOB", "Sally Mae"];
+        let names3 = merge_sort(ile, names1);
+        assert names3 == names2;
+    }
 }
 
 // Local Variables: