From d2135597e994759776d45d5622153e8b39e1869d Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Mon, 5 Mar 2012 18:23:01 -0800
Subject: std: Use util::unreachable

---
 src/libstd/generic_os.rs |  2 +-
 src/libstd/rope.rs       | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/libstd')

diff --git a/src/libstd/generic_os.rs b/src/libstd/generic_os.rs
index a2ad61cbd05..77cab821c5f 100644
--- a/src/libstd/generic_os.rs
+++ b/src/libstd/generic_os.rs
@@ -80,7 +80,7 @@ fn getenv(n: str) -> option<str> {
             ret option::some(str::from_bytes(v)); // UTF-8 or fail
         } else { nsize = res; }
     }
-    fail;
+    util::unreachable();
 }
 
 #[cfg(target_os = "win32")]
diff --git a/src/libstd/rope.rs b/src/libstd/rope.rs
index 225d59b39e1..bf8aa7667a2 100644
--- a/src/libstd/rope.rs
+++ b/src/libstd/rope.rs
@@ -1028,7 +1028,7 @@ mod node {
               }
             }
         }
-        fail;//Note: unreachable
+        util::unreachable();
     }
 
     /*
@@ -1092,7 +1092,7 @@ mod node {
               }
             }
         }
-        fail;
+        util::unreachable();
     }
 
     fn concat2(left: @node, right: @node) -> @node {
@@ -1176,7 +1176,7 @@ mod node {
               }
             }
         }
-        fail;//unreachable
+        util::unreachable();
     }
 
     /*
@@ -1209,7 +1209,7 @@ mod node {
               }
             }
         }
-        fail;//unreachable
+        util::unreachable();
     }
 
     mod leaf_iterator {
@@ -1248,7 +1248,7 @@ mod node {
                   }
                 }
             }
-            fail;//unreachable
+            util::unreachable();
         }
     }
 
@@ -1292,7 +1292,7 @@ mod node {
                   }
                 }
             }
-            fail;//unreachable
+            util::unreachable();
         }
 
         fn get_current_or_next_leaf(it: t) -> option<leaf> {
-- 
cgit 1.4.1-3-g733a5