---

thestinger · thestinger · commit 25c3f1037e25 · 2013-02-06T17:37:56.000-05:00
yaml --- r: 43003 b: refs/heads/try c: dab2f2f h: refs/heads/master i: 43001: 0d1ff49 42999: a16062b v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
-refs/heads/try: bdfb930f3412bcbf792bd8ab10f40b6560663a5f
+refs/heads/try: dab2f2fac0d5147b088489abfbcf43714ed36156
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
diff --git a/branches/try/src/libstd/smallintmap.rs b/branches/try/src/libstd/smallintmap.rs
@@ -116,8 +116,6 @@ pub impl<V> SmallIntMap<V> {
 }
 
 pub impl<V: Copy> SmallIntMap<V> {
-    // FIXME: #4733, remove after the next snapshot
-    #[cfg(stage2)]
     fn update_with_key(&mut self, key: uint, val: V,
                        ff: fn(uint, V, V) -> V) -> bool {
         match self.find(&key) {
@@ -126,8 +124,6 @@ pub impl<V: Copy> SmallIntMap<V> {
         }
     }
 
-    // FIXME: #4733, remove after the next snapshot
-    #[cfg(stage2)]
     fn update(&mut self, key: uint, newval: V, ff: fn(V, V) -> V) -> bool {
         self.update_with_key(key, newval, |_k, v, v1| ff(v,v1))
     }

Original file line number	Diff line number	Diff line change
`@@ -116,8 +116,6 @@ pub impl<V> SmallIntMap<V> {`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`pub impl<V: Copy> SmallIntMap<V> {`
`119`		`- // FIXME: #4733, remove after the next snapshot`
`120`		`- #[cfg(stage2)]`
`121`	`119`	`fn update_with_key(&mut self, key: uint, val: V,`
`122`	`120`	`ff: fn(uint, V, V) -> V) -> bool {`
`123`	`121`	`match self.find(&key) {`
`@@ -126,8 +124,6 @@ pub impl<V: Copy> SmallIntMap<V> {`
`126`	`124`	`}`
`127`	`125`	`}`
`128`	`126`
`129`		`- // FIXME: #4733, remove after the next snapshot`
`130`		`- #[cfg(stage2)]`
`131`	`127`	`fn update(&mut self, key: uint, newval: V, ff: fn(V, V) -> V) -> bool {`
`132`	`128`	`self.update_with_key(key, newval, \|_k, v, v1\| ff(v,v1))`
`133`	`129`	`}`