---

yaml
---
r: 3907
b: refs/heads/master
c: 8c94d8f
h: refs/heads/master
i:
  3905: 9ae3a02
  3903: 6c687cb
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f26ca025dee246500552076cc650137e12c04464
+refs/heads/master: 8c94d8fd54ba864e6a603ba6d90d41ccfaa62f53

trunk/src/comp/middle/typeck.rs

@@ -2672,7 +2672,10 @@ fn check_main_fn_ty(&ty::ctxt tcx, &ast::node_id main_id) {
     alt (ty::struct(tcx, main_t)) {
         case (ty::ty_fn(ast::proto_fn, ?args, ?rs, ast::return, ?constrs)) {
             auto ok = ivec::len(constrs) == 0u;
-            ok &= ty::type_is_nil(tcx, rs);
+            ok &= ty::type_is_nil(tcx, rs) || alt (ty::struct(tcx, rs)) {
+                ty::ty_int { true }
+                _ { false }
+            };
             auto num_args = ivec::len(args);
             ok &= num_args == 0u || (num_args == 1u &&
                                      arg_is_argv_ty(tcx, args.(0)));

trunk/src/test/run-pass/main-int-synonym.rs

@@ -0,0 +1,2 @@
+type i = int;
+fn main() -> i { 0 }

trunk/src/test/run-pass/main-int.rs

@@ -0,0 +1 @@
+fn main() -> int { 0 }