---

yaml
---
r: 6573
b: refs/heads/master
c: a69eab1
h: refs/heads/master
i:
  6571: 096c3b8
v: v3

Author: boggle

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1eb7ce013526c6ae75e92a31fe3b89b4cf44b3f
+refs/heads/master: a69eab16ec3435bd505a7dafcb9a82b5eace49a2

trunk/src/comp/middle/typeck.rs

@@ -2116,6 +2116,20 @@ fn check_expr_with_unifier(fcx: @fn_ctxt, expr: @ast::expr, unify: unifier,
         let t_1 = ast_ty_to_ty_crate(fcx.ccx, t);
         let t_e = expr_ty(tcx, e);
 
+        if ty::type_is_nil(tcx, t_e) {
+            tcx.sess.span_err(expr.span,
+                              "cast from nil: " +
+                                  ty_to_str(tcx, expr_ty(tcx, e)) + " as " +
+                                  ty_to_str(tcx, t_1));
+        }
+
+        if ty::type_is_nil(tcx, t_1) {
+            tcx.sess.span_err(expr.span,
+                              "cast to nil: " +
+                                  ty_to_str(tcx, expr_ty(tcx, e)) + " as " +
+                                  ty_to_str(tcx, t_1));
+        }
+
         // FIXME there are more forms of cast to support, eventually.
         if !(   type_is_scalar(fcx, expr.span, t_e)
              && type_is_scalar(fcx, expr.span, t_1)) {

trunk/src/test/compile-fail/cast-from-nil.rs

@@ -0,0 +1,2 @@
+// error-pattern: cast from nil: () as u32
+fn main() { let u = (assert true) as u32; }

trunk/src/test/compile-fail/cast-to-nil.rs

@@ -0,0 +1,2 @@
+// error-pattern: cast to nil: u32 as ()
+fn main() { let u = 0u32 as (); }