---

yaml
---
r: 11484
b: refs/heads/master
c: c28c258
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 13781f3d8dbc966b2edc5d10747a62378d616287
+refs/heads/master: c28c258f915f0ab46a51519a2b79bd42af383891
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/comp/middle/typeck.rs

@@ -3066,6 +3066,19 @@ fn check_main_fn_ty(tcx: ty::ctxt, main_id: ast::node_id, main_span: span) {
     alt ty::get(main_t).struct {
       ty::ty_fn({proto: ast::proto_bare, inputs, output,
                  ret_style: ast::return_val, constraints}) {
+        alt tcx.items.find(main_id) {
+         some(ast_map::node_item(it,_)) {
+             alt it.node {
+               ast::item_fn(_,ps,_) if vec::is_not_empty(ps) {
+                  tcx.sess.span_err(main_span,
+                    "main function is not allowed to have type parameters");
+                  ret;
+               }
+               _ {}
+             }
+         }
+         _ {}
+        }
         let ok = vec::len(constraints) == 0u;
         ok &= ty::type_is_nil(output);
         let num_args = vec::len(inputs);

trunk/src/test/compile-fail/issue-1900.rs

@@ -0,0 +1,2 @@
+// error-pattern: main function is not allowed to have type parameters
+fn main<T>() { }