---

14427 · 14427 · commit 4b0b0d6c5e29 · 2012-10-22T21:53:37.000-05:00
yaml --- r: 36067 b: refs/heads/try2 c: 254a86e h: refs/heads/master i: 36065: baab18c 36063: 5fa8f23 v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 781e446e2675c397d9be8a70f5e3e8c4fae0695c
+refs/heads/try2: 254a86e49edb0fbf38d335a50b1ab535fa7fd757
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
diff --git a/branches/try2/src/libstd/sort.rs b/branches/try2/src/libstd/sort.rs
@@ -751,7 +751,7 @@ impl<T: Ord> MergeState<T> {
             }
             array[dest] <-> self.tmp[c2];
         } else if len2 == 0 {
-            fail ~"Coparison violates its contract!";
+            fail ~"Comparison violates its contract!";
         } else {
             assert len1 == 0;
             assert len2 != 0;

Original file line number	Diff line number	Diff line change
`@@ -751,7 +751,7 @@ impl<T: Ord> MergeState<T> {`
`751`	`751`	`}`
`752`	`752`	`array[dest] <-> self.tmp[c2];`
`753`	`753`	`} else if len2 == 0 {`
`754`		`- fail ~"Coparison violates its contract!";`
	`754`	`+ fail ~"Comparison violates its contract!";`
`755`	`755`	`} else {`
`756`	`756`	`assert len1 == 0;`
`757`	`757`	`assert len2 != 0;`