From 5cdb010fae38917fbcacc973c471ddd72f8f5bfc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 22 Jul 2011 20:15:35 +0200
Subject: [PATCH] Remove typechecker work-arounds now that I know how

---
 src/comp/lib/llvm.rs     | 2 +-
 src/comp/middle/trans.rs | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/comp/lib/llvm.rs b/src/comp/lib/llvm.rs
index f2260922c566..96c00225dcd3 100644
--- a/src/comp/lib/llvm.rs
+++ b/src/comp/lib/llvm.rs
@@ -1549,7 +1549,7 @@ fn float_width(TypeRef llt) -> uint {
       2 { 64u }
       3 { 80u }
       4 | 5 { 128u }
-      _ { fail "llvm_float_width called on a non-float type"; 0u }
+      _ { fail "llvm_float_width called on a non-float type" }
     };
 }
 
diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs
index aa50e5ff0c2c..52e5ac2bb75d 100644
--- a/src/comp/middle/trans.rs
+++ b/src/comp/middle/trans.rs
@@ -4465,8 +4465,7 @@ fn trans_cast(&@block_ctxt cx, &@ast::expr e, ast::node_id id) -> result {
         e_res.bcx.build.PointerCast(e_res.val, ll_t_out)
       }
       _ {
-        ccx.sess.bug("Translating unsupported cast.");
-        C_nil() // FIXME the typechecker doesn't seem to understand _|_ here
+        ccx.sess.bug("Translating unsupported cast.")
       }
     };
     ret rslt(e_res.bcx, newval);