---

yaml
---
r: 217299
b: refs/heads/master
c: 20f22b7
h: refs/heads/master
i:
  217297: 3e20343
  217295: 0e5d1ef
v: v3

Author: GuillaumeGomez

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c158be082f07c2b2ed0a5f1db33627709396ac63
+refs/heads/master: 20f22b7f0e29068414933dd6d41c6a5785d3fd75
 refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
 refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/src/librustc_typeck/diagnostics.rs

@@ -1022,6 +1022,42 @@ type Foo<A> = Box<A>; // ok!
 ```
 "##,
 
+E0093: r##"
+You called an unknown intrinsic function. Erroneous code example:
+
+```
+#![feature(intrinsics)]
+
+extern "rust-intrinsic" {
+    fn foo();
+}
+
+fn main() {
+    unsafe {
+        foo();
+    }
+}
+```
+
+Please check you didn't make a mistake in the function's name. All intrinsic
+functions are defined in librustc_trans/trans/intrinsic.rs and in
+libcore/intrinsics.rs. Example:
+
+```
+#![feature(intrinsics)]
+
+extern "rust-intrinsic" {
+    fn atomic_fence();
+}
+
+fn main() {
+    unsafe {
+        atomic_fence();
+    }
+}
+```
+"##,
+
 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
@@ -1688,7 +1724,6 @@ register_diagnostics! {
     E0086,
     E0090,
     E0092,
-    E0093,
     E0094,
     E0101,
     E0102,