---

yaml
---
r: 2895
b: refs/heads/master
c: 528c651
h: refs/heads/master
i:
  2893: 98f9775
  2891: d75b821
  2887: 4ce3f66
  2879: 4c1d3ee
v: v3

Author: lkuper

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d569a71b0b4bac30a4b15b10d95d839e915cd0b3
+refs/heads/master: 528c6516f052323686a21cc77cbc7cad220f065d

trunk/src/comp/middle/typeck.rs

@@ -2009,9 +2009,8 @@ fn check_expr(&@stmt_ctxt scx, &@ast::expr expr) {
                 case (none) {
                     auto nil = ty::mk_nil(scx.fcx.ccx.tcx);
                     if (!are_compatible(scx, scx.fcx.ret_ty, nil)) {
-                        // TODO: span_err
-                        scx.fcx.ccx.tcx.sess.err("ret; in function " +
-                            "returning non-nil");
+                        scx.fcx.ccx.tcx.sess.span_err(expr.span,
+                          "ret; in function returning non-nil");
                     }
 
                     write::bot_ty(scx.fcx.ccx.tcx, a.id);

trunk/src/test/compile-fail/ret-non-nil.rs

@@ -0,0 +1,14 @@
+// error-pattern: ret; in function returning non-nil
+
+fn f() {
+    ret;
+}
+
+fn g() -> int {
+    ret;
+}
+
+fn main() {
+    f();
+    g();
+}