librustc: Add explicit self to IterBytes. r=nmatsakis

Author: pcwalton

src/libcore/to_bytes.rs

@@ -483,11 +483,19 @@ impl root_map_key : cmp::Eq {
     }
 }
 
+#[cfg(stage0)]
 impl root_map_key : to_bytes::IterBytes {
     pure fn iter_bytes(+lsb0: bool, f: to_bytes::Cb) {
         to_bytes::iter_bytes_2(&self.id, &self.derefs, lsb0, f);
     }
 }
+#[cfg(stage1)]
+#[cfg(stage2)]
+impl root_map_key : to_bytes::IterBytes {
+    pure fn iter_bytes(&self, +lsb0: bool, f: to_bytes::Cb) {
+        to_bytes::iter_bytes_2(&self.id, &self.derefs, lsb0, f);
+    }
+}
 
 fn root_map() -> root_map {
     return HashMap();

src/librustc/middle/borrowck.rs

@@ -1226,6 +1226,7 @@ impl mono_id_ : cmp::Eq {
     pure fn ne(&self, other: &mono_id_) -> bool { !(*self).eq(other) }
 }
 
+#[cfg(stage0)]
 impl mono_param_id : to_bytes::IterBytes {
     pure fn iter_bytes(+lsb0: bool, f: to_bytes::Cb) {
         match self {
@@ -1239,12 +1240,35 @@ impl mono_param_id : to_bytes::IterBytes {
         }
     }
 }
+#[cfg(stage1)]
+#[cfg(stage2)]
+impl mono_param_id : to_bytes::IterBytes {
+    pure fn iter_bytes(&self, +lsb0: bool, f: to_bytes::Cb) {
+        match *self {
+          mono_precise(t, mids) =>
+          to_bytes::iter_bytes_3(&0u8, &ty::type_id(t), &mids, lsb0, f),
+
+          mono_any => 1u8.iter_bytes(lsb0, f),
 
+          mono_repr(ref a, ref b, ref c, ref d) =>
+          to_bytes::iter_bytes_5(&2u8, a, b, c, d, lsb0, f)
+        }
+    }
+}
+
+#[cfg(stage0)]
 impl mono_id_ : core::to_bytes::IterBytes {
     pure fn iter_bytes(+lsb0: bool, f: to_bytes::Cb) {
         to_bytes::iter_bytes_2(&self.def, &self.params, lsb0, f);
     }
 }
+#[cfg(stage1)]
+#[cfg(stage2)]
+impl mono_id_ : core::to_bytes::IterBytes {
+    pure fn iter_bytes(&self, +lsb0: bool, f: to_bytes::Cb) {
+        to_bytes::iter_bytes_2(&self.def, &self.params, lsb0, f);
+    }
+}
 
 fn umax(cx: block, a: ValueRef, b: ValueRef) -> ValueRef {
     let cond = build::ICmp(cx, lib::llvm::IntULT, a, b);

src/librustc/middle/trans/common.rs

@@ -155,11 +155,19 @@ impl DatumMode: cmp::Eq {
     pure fn ne(&self, other: &DatumMode) -> bool { !(*self).eq(other) }
 }
 
+#[cfg(stage0)]
 impl DatumMode: to_bytes::IterBytes {
     pure fn iter_bytes(+lsb0: bool, f: to_bytes::Cb) {
         (self as uint).iter_bytes(lsb0, f)
     }
 }
+#[cfg(stage1)]
+#[cfg(stage2)]
+impl DatumMode: to_bytes::IterBytes {
+    pure fn iter_bytes(&self, +lsb0: bool, f: to_bytes::Cb) {
+        (*self as uint).iter_bytes(lsb0, f)
+    }
+}
 
 /// See `Datum Sources` section at the head of this module.
 enum DatumSource {