---

yaml
---
r: 217576
b: refs/heads/tmp
c: ed6940f
h: refs/heads/master
v: v3

Author: GuillaumeGomez

[refs]

@@ -25,7 +25,7 @@ refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/beta: 2ad26e850ed5dfedda8c96d7315aee50145ceedd
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 20f22b7f0e29068414933dd6d41c6a5785d3fd75
+refs/heads/tmp: ed6940fd384b1e42c3e3ad229e022af2e13b79c7
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: a5286998df566e736b32f6795bfc3803bdaf453d
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828

branches/tmp/src/librustc_typeck/diagnostics.rs

@@ -1029,7 +1029,7 @@ You called an unknown intrinsic function. Erroneous code example:
 #![feature(intrinsics)]
 
 extern "rust-intrinsic" {
-    fn foo();
+    fn foo(); // error: unrecognized intrinsic function: `foo`
 }
 
 fn main() {
@@ -1047,7 +1047,7 @@ libcore/intrinsics.rs. Example:
 #![feature(intrinsics)]
 
 extern "rust-intrinsic" {
-    fn atomic_fence();
+    fn atomic_fence(); // ok!
 }
 
 fn main() {
@@ -1058,6 +1058,31 @@ fn main() {
 ```
 "##,
 
+E0094: r##"
+You gave an invalid number of type parameters to an intrinsic function.
+Erroneous code example:
+
+```
+#![feature(intrinsics)]
+
+extern "rust-intrinsic" {
+    fn size_of<T, U>() -> usize; // error: intrinsic has wrong number
+                                 //        of type parameters
+}
+```
+
+Please check you give the right number of lifetime parameters and/or the
+function definition. Example:
+
+```
+#![feature(intrinsics)]
+
+extern "rust-intrinsic" {
+    fn size_of<T>() -> usize; // ok!
+}
+```
+"##,
+
 E0106: r##"
 This error indicates that a lifetime is missing from a type. If it is an error
 inside a function signature, the problem may be with failing to adhere to the
@@ -1724,7 +1749,6 @@ register_diagnostics! {
     E0086,
     E0090,
     E0092,
-    E0094,
     E0101,
     E0102,
     E0103,