---

yaml
---
r: 206654
b: refs/heads/beta
c: ffc0d04
h: refs/heads/master
v: v3

Author: caipre

[refs]

@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: 5613502a4f3476e5db2c68bdf203104556796630
+refs/heads/beta: ffc0d0448917c1f225a3500bf3a1dc6fc40029d7
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 579e31929feff51dcaf8d444648eff8de735f91a

branches/beta/src/librustc_typeck/diagnostics.rs

@@ -136,6 +136,20 @@ construct an instance of the following type using only safe code:
 ```
 enum Empty {}
 ```
+"##,
+
+E0131: r##"
+It is not possible to define `main` with type parameters, or even with function
+parameters. When `main` is present, it must take no arguments and return `()`.
+"##,
+
+E0132: r##"
+It is not possible to declare type parameters on a function that has the `start`
+attribute. Such a function must have the following type signature:
+
+```
+fn(isize, *const *const u8) -> isize
+```
 "##
 
 }
@@ -205,8 +219,6 @@ register_diagnostics! {
     E0128,
     E0129,
     E0130,
-    E0131,
-    E0132,
     E0141,
     E0159,
     E0163,