---

yaml
---
r: 235029
b: refs/heads/stable
c: ed6940f
h: refs/heads/master
i:
  235027: 28cb2db
v: v3

Author: GuillaumeGomez

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 20f22b7f0e29068414933dd6d41c6a5785d3fd75
+refs/heads/stable: ed6940fd384b1e42c3e3ad229e022af2e13b79c7
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/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,