---

yaml
---
r: 14795
b: refs/heads/try
c: 664d71f
h: refs/heads/master
i:
  14793: a23f8d6
  14791: 2ec0535
v: v3

Author: catamorphism

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: fde4c1efbbe2c3fbd29b50a9fe61283714cd8769
+refs/heads/try: 664d71f1f0c0e7ec70c6c521117bde95e027bfcf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustc/middle/typeck.rs

@@ -3122,10 +3122,11 @@ fn check_main_fn_ty(tcx: ty::ctxt, main_id: ast::node_id, main_span: span) {
         ok &= num_args == 0u || num_args == 1u &&
               arg_is_argv_ty(tcx, inputs[0]);
         if !ok {
-            tcx.sess.span_err(main_span,
-                              "wrong type in main function: found `" +
-                                  ty_to_str(tcx, main_t) + "`");
-        }
+                tcx.sess.span_err(main_span,
+                   #fmt("Wrong type in main function: found `%s`, \
+                   expecting `native fn([str]) -> ()` or `native fn() -> ()`",
+                         ty_to_str(tcx, main_t)));
+         }
       }
       _ {
         tcx.sess.span_bug(main_span,

branches/try/src/test/compile-fail/bad-main.rs

@@ -1,3 +1,3 @@
-// error-pattern:wrong type in main function
+// error-pattern:expecting `native fn([str])
 
 fn main(x: int) { }

branches/try/src/test/compile-fail/main-wrong-type-2.rs

@@ -1,3 +1,3 @@
 fn main() -> char {
-//!^ ERROR wrong type in main function: found `native fn() -> char`
+//!^ ERROR Wrong type in main function: found `native fn() -> char`
 }

branches/try/src/test/compile-fail/main-wrong-type.rs

@@ -1,3 +1,3 @@
 fn main(foo: {x: int, y: int}) {
-//!^ ERROR wrong type in main function: found `native fn({x: int,y: int})`
+//!^ ERROR Wrong type in main function: found `native fn({x: int,y: int})`
 }