---

yaml
---
r: 4557
b: refs/heads/master
c: 0cddcac
h: refs/heads/master
i:
  4555: f6d3b02
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 612fe3d2d6fa0dcb3d92a0d83ec7f2418dd8c7ce
+refs/heads/master: 0cddcac0169a33163dc434eb325d48d7f193efc4

trunk/src/comp/middle/typeck.rs

@@ -2681,13 +2681,15 @@ fn check_main_fn_ty(tcx: &ty::ctxt, main_id: &ast::node_id) {
         ok &=
             num_args == 0u || num_args == 1u && arg_is_argv_ty(tcx, args.(0));
         if !ok {
-            tcx.sess.err("wrong type in main function: found " +
-                             ty_to_str(tcx, main_t));
+            let span = ast_map::node_span(tcx.items.get(main_id));
+            tcx.sess.span_err(span, "wrong type in main function: found " +
+                              ty_to_str(tcx, main_t));
         }
       }
       _ {
-        tcx.sess.bug("main has a non-function type: found" +
-                         ty_to_str(tcx, main_t));
+        let span = ast_map::node_span(tcx.items.get(main_id));
+        tcx.sess.span_bug(span, "main has a non-function type: found" +
+                          ty_to_str(tcx, main_t));
       }
     }
 }