auto merge of #4934 : nickdesaulniers/rust/issue4524cleanup, r=brson

review? @brson
Issue #4524

1 files changed, 3 insertions, 3 deletions

diff --git a/src/libcore/hashmap.rs b/src/libcore/hashmap.rs
index 1e9f05a35eb..9ec91d38515 100644
--- a/src/libcore/hashmap.rs
+++ b/src/libcore/hashmap.rs
@@ -159,7 +159,7 @@ pub mod linear {
         pure fn value_for_bucket(&self, idx: uint) -> &self/V {
             match self.buckets[idx] {
                 Some(ref bkt) => &bkt.value,
-                None => die!(~"LinearMap::find: internal logic error"),
+                None => fail!(~"LinearMap::find: internal logic error"),
             }
         }
 
@@ -373,7 +373,7 @@ pub mod linear {
 
             let hash = k.hash_keyed(self.k0, self.k1) as uint;
             let idx = match self.bucket_for_key_with_hash(hash, &k) {
-                TableFull => die!(~"Internal logic error"),
+                TableFull => fail!(~"Internal logic error"),
                 FoundEntry(idx) => idx,
                 FoundHole(idx) => {
                     self.buckets[idx] = Some(Bucket{hash: hash, key: k,
@@ -403,7 +403,7 @@ pub mod linear {
 
             let hash = k.hash_keyed(self.k0, self.k1) as uint;
             let idx = match self.bucket_for_key_with_hash(hash, &k) {
-                TableFull => die!(~"Internal logic error"),
+                TableFull => fail!(~"Internal logic error"),
                 FoundEntry(idx) => idx,
                 FoundHole(idx) => {
                     let v = f(&k);