about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorNick Platt <platt.nicholas@gmail.com>2015-05-09 23:20:14 -0400
committerNick Platt <platt.nicholas@gmail.com>2015-05-10 11:04:24 -0400
commitffc0d0448917c1f225a3500bf3a1dc6fc40029d7 (patch)
tree8be42ddddd91daac9ddd65d91fd531b788b8c56c /src
parent5613502a4f3476e5db2c68bdf203104556796630 (diff)
downloadrust-ffc0d0448917c1f225a3500bf3a1dc6fc40029d7.tar.gz
rust-ffc0d0448917c1f225a3500bf3a1dc6fc40029d7.zip
Add long diagnostic for E0131, E0132
Diffstat (limited to 'src')
-rw-r--r--src/librustc_typeck/diagnostics.rs16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/librustc_typeck/diagnostics.rs b/src/librustc_typeck/diagnostics.rs
index 2cc1b23e03e..026ba3d08b4 100644
--- a/src/librustc_typeck/diagnostics.rs
+++ b/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,