From 4d8f715dab7862b4ad1f0c856f0e3cdd554e212a Mon Sep 17 00:00:00 2001
From: Brian Anderson <andersrb@gmail.com>
Date: Sun, 5 Jun 2011 00:11:17 -0400
Subject: [PATCH] rustc: Make resolve::unresolved return !. Remove redundant
 fails

---
 src/comp/middle/resolve.rs | 7 +------
 src/comp/middle/trans.rs   | 2 --
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/comp/middle/resolve.rs b/src/comp/middle/resolve.rs
index 56d8d3450ae0..12dd167e635c 100644
--- a/src/comp/middle/resolve.rs
+++ b/src/comp/middle/resolve.rs
@@ -481,7 +481,7 @@ fn ns_name(namespace ns) -> str {
     }
 }
 
-fn unresolved(&env e, &span sp, &ident id, &str kind) {
+fn unresolved(&env e, &span sp, &ident id, &str kind) -> ! {
     e.sess.span_err(sp, "unresolved " + kind + ": " + id);
 }
 
@@ -511,8 +511,6 @@ fn lookup_in_scope_strict(&env e, list[scope] sc, &span sp, &ident id,
             ret d;
         }
     }
-
-    fail; // fools the return-checker
 }
 
 fn scope_is_fn(&scope sc) -> bool {
@@ -793,8 +791,6 @@ fn lookup_in_mod_strict(&env e, def m, &span sp, &ident id,
             ret d;
         }
     }
-
-    fail; // fools the return-checker
 }
 
 fn lookup_in_mod(&env e, def m, &span sp, &ident id, namespace ns, dir dr)
@@ -854,7 +850,6 @@ fn lookup_import(&env e, def_id defid, namespace ns) -> option::t[def] {
                            case (ns_module) { md } };
         }
     }
-    fail; // fools the return-checker
 }
 
 
diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs
index 9ffc6d429c0a..0db041300520 100644
--- a/src/comp/middle/trans.rs
+++ b/src/comp/middle/trans.rs
@@ -1215,8 +1215,6 @@ fn find_scope_cx(&@block_ctxt cx) -> @block_ctxt {
                                     + "called on parentless block_ctxt");
         }
     }
-
-    fail; // fools the return-checker
 }
 
 fn umax(&@block_ctxt cx, ValueRef a, ValueRef b) -> ValueRef {