---

catamorphism · catamorphism · commit 68b43d1200f3 · 2012-08-22T15:24:33.000-07:00
yaml --- r: 23389 b: refs/heads/master c: 73ffc7e h: refs/heads/master i: 23387: 2b9a11f v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 6f77fcbd0792f01f2b4fe91db8eca79f07a4bee0
+refs/heads/master: 73ffc7e7005142c5a2d898fcb2aa39018efe07fb
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
diff --git a/trunk/src/libcore/send_map.rs b/trunk/src/libcore/send_map.rs
@@ -258,8 +258,11 @@ mod linear {
         fn find(k: &K) -> option<V> {
             match self.bucket_for_key(self.buckets, k) {
               FoundEntry(idx) => {
-                match check self.buckets[idx] {
+                match self.buckets[idx] {
                   some(bkt) => {some(copy bkt.value)}
+                  // FIXME (#3148): Will be able to get rid of this when we
+                  // redefine SearchResult
+                  none      => fail ~"LinearMap::find: internal logic error"
                 }
               }
               TableFull | FoundHole(_) => {

Original file line number	Diff line number	Diff line change
`@@ -258,8 +258,11 @@ mod linear {`
`258`	`258`	`fn find(k: &K) -> option<V> {`
`259`	`259`	`match self.bucket_for_key(self.buckets, k) {`
`260`	`260`	`FoundEntry(idx) => {`
`261`		`- match check self.buckets[idx] {`
	`261`	`+ match self.buckets[idx] {`
`262`	`262`	`some(bkt) => {some(copy bkt.value)}`
	`263`	`+ // FIXME (#3148): Will be able to get rid of this when we`
	`264`	`+ // redefine SearchResult`
	`265`	`+ none => fail ~"LinearMap::find: internal logic error"`
`263`	`266`	`}`
`264`	`267`	`}`
`265`	`268`	`TableFull \| FoundHole(_) => {`