---

catamorphism · catamorphism · commit 2ab468c14639 · 2012-08-22T15:24:33.000-07:00
yaml --- r: 27966 b: refs/heads/try c: 6f77fcb h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: 48a4bca0665f42991c0958818fd5597014e1129f
+refs/heads/try: 6f77fcbd0792f01f2b4fe91db8eca79f07a4bee0
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
diff --git a/branches/try/src/libcore/send_map.rs b/branches/try/src/libcore/send_map.rs
@@ -28,8 +28,9 @@ mod linear {
             buckets: ~[option<Bucket<K,V>>]})
     }
 
-    // FIXME(#2979) -- with #2979 we could rewrite found_entry
+    // FIXME(#3148) -- we could rewrite found_entry
     // to have type option<&bucket<K,V>> which would be nifty
+    // However, that won't work until #3148 is fixed
     enum SearchResult {
         FoundEntry(uint), FoundHole(uint), TableFull
     }

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,9 @@ mod linear {`
`28`	`28`	`buckets: ~[option<Bucket<K,V>>]})`
`29`	`29`	`}`
`30`	`30`
`31`		`- // FIXME(#2979) -- with #2979 we could rewrite found_entry`
	`31`	`+ // FIXME(#3148) -- we could rewrite found_entry`
`32`	`32`	`// to have type option<&bucket<K,V>> which would be nifty`
	`33`	`+ // However, that won't work until #3148 is fixed`
`33`	`34`	`enum SearchResult {`
`34`	`35`	`FoundEntry(uint), FoundHole(uint), TableFull`
`35`	`36`	`}`