librustc: Implement explicit self for Add and Index; add a hack in the borrow checker to support this. r=nmatsakis

1 files changed, 10 insertions, 0 deletions

diff --git a/src/libstd/map.rs b/src/libstd/map.rs
index 05a8e37d9af..add1976539c 100644
--- a/src/libstd/map.rs
+++ b/src/libstd/map.rs
@@ -429,6 +429,7 @@ pub mod chained {
         }
     }
 
+    #[cfg(stage0)]
     impl<K:Eq IterBytes Hash Copy, V: Copy> T<K, V>: ops::Index<K, V> {
         pure fn index(k: K) -> V {
             unsafe {
@@ -436,6 +437,15 @@ pub mod chained {
             }
         }
     }
+    #[cfg(stage1)]
+    #[cfg(stage2)]
+    impl<K:Eq IterBytes Hash Copy, V: Copy> T<K, V>: ops::Index<K, V> {
+        pure fn index(&self, k: K) -> V {
+            unsafe {
+                self.get(k)
+            }
+        }
+    }
 
     fn chains<K,V>(nchains: uint) -> ~[mut Option<@Entry<K,V>>] {
         vec::to_mut(vec::from_elem(nchains, None))