---

yaml
---
r: 145085
b: refs/heads/try2
c: 6ba2cb8
h: refs/heads/master
i:
  145083: da87b6a
v: v3

Author: lkuper

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 653ffa845d70b26a49e227ae4445729c369c9f80
+refs/heads/try2: 6ba2cb88a6866f96f26f2906654f03f97dd8e53b
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libsyntax/codemap.rs

@@ -30,12 +30,12 @@ pub trait Pos {
 }
 
 /// A byte offset
-#[deriving(Clone, Eq, IterBytes)]
+#[deriving(Clone, Eq, IterBytes, Ord)]
 pub struct BytePos(uint);
 /// A character offset. Because of multibyte utf8 characters, a byte offset
 /// is not equivalent to a character offset. The CodeMap will convert BytePos
 /// values to CharPos values as necessary.
-#[deriving(Eq,IterBytes)]
+#[deriving(Eq,IterBytes, Ord)]
 pub struct CharPos(uint);
 
 // XXX: Lots of boilerplate in these impls, but so far my attempts to fix
@@ -46,13 +46,6 @@ impl Pos for BytePos {
     fn to_uint(&self) -> uint { **self }
 }
 
-impl cmp::Ord for BytePos {
-    fn lt(&self, other: &BytePos) -> bool { **self < **other }
-    fn le(&self, other: &BytePos) -> bool { **self <= **other }
-    fn ge(&self, other: &BytePos) -> bool { **self >= **other }
-    fn gt(&self, other: &BytePos) -> bool { **self > **other }
-}
-
 impl Add<BytePos, BytePos> for BytePos {
     fn add(&self, rhs: &BytePos) -> BytePos {
         BytePos(**self + **rhs)
@@ -70,13 +63,6 @@ impl Pos for CharPos {
     fn to_uint(&self) -> uint { **self }
 }
 
-impl cmp::Ord for CharPos {
-    fn lt(&self, other: &CharPos) -> bool { **self < **other }
-    fn le(&self, other: &CharPos) -> bool { **self <= **other }
-    fn ge(&self, other: &CharPos) -> bool { **self >= **other }
-    fn gt(&self, other: &CharPos) -> bool { **self > **other }
-}
-
 impl Add<CharPos,CharPos> for CharPos {
     fn add(&self, rhs: &CharPos) -> CharPos {
         CharPos(**self + **rhs)