---

catamorphism · catamorphism · commit 608171f7ba31 · 2012-08-24T21:35:35.000-07:00
yaml --- r: 23476 b: refs/heads/master c: c7a3d0e h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 0dad78e03d411a5bae4a7aa20eda93231634a095
+refs/heads/master: c7a3d0eb5820e63225b45a2e2c8c4e9b8f658601
 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
@@ -295,8 +295,11 @@ mod linear {
         fn find(&const self, k: &K) -> option<V> {
             match self.bucket_for_key(self.buckets, k) {
               FoundEntry(idx) => {
-                match check self.buckets[idx] {
-                  some(bkt) => {some(copy bkt.value)}
+                // FIXME (#3148): Once we rewrite found_entry, this
+                // failure case won't be necessary
+                match self.buckets[idx] {
+                    some(bkt) => {some(copy bkt.value)}
+                    none => fail ~"LinearMap::find: internal logic error"
                 }
               }
               TableFull | FoundHole(_) => {

Original file line number	Diff line number	Diff line change
`@@ -295,8 +295,11 @@ mod linear {`
`295`	`295`	`fn find(&const self, k: &K) -> option<V> {`
`296`	`296`	`match self.bucket_for_key(self.buckets, k) {`
`297`	`297`	`FoundEntry(idx) => {`
`298`		`- match check self.buckets[idx] {`
`299`		`- some(bkt) => {some(copy bkt.value)}`
	`298`	`+ // FIXME (#3148): Once we rewrite found_entry, this`
	`299`	`+ // failure case won't be necessary`
	`300`	`+ match self.buckets[idx] {`
	`301`	`+ some(bkt) => {some(copy bkt.value)}`
	`302`	`+ none => fail ~"LinearMap::find: internal logic error"`
`300`	`303`	`}`
`301`	`304`	`}`
`302`	`305`	`TableFull \| FoundHole(_) => {`