Auto merge of #30264 - GuillaumeGomez:patch-5, r=Manishearth

r? @Manishearth

Also: should I merged both commits? Not sure if it's really useful to keep the first one.

2 files changed, 17 insertions, 4 deletions

diff --git a/src/librustc/diagnostics.rs b/src/librustc/diagnostics.rs
index 715850154f6..178d8a87214 100644
--- a/src/librustc/diagnostics.rs
+++ b/src/librustc/diagnostics.rs
@@ -2323,9 +2323,9 @@ register_diagnostics! {
     E0285, // overflow evaluation builtin bounds
     E0298, // mismatched types between arms
     E0299, // mismatched types between arms
-    E0300, // unexpanded macro
-    E0304, // expected signed integer constant
-    E0305, // expected constant
+    // E0300, // unexpanded macro
+    // E0304, // expected signed integer constant
+    // E0305, // expected constant
     E0311, // thing may not live long enough
     E0312, // lifetime of reference outlives lifetime of borrowed content
     E0313, // lifetime of borrowed pointer outlives lifetime of captured variable
diff --git a/src/librustc_metadata/diagnostics.rs b/src/librustc_metadata/diagnostics.rs
index 2340efd2cae..50b9ea57550 100644
--- a/src/librustc_metadata/diagnostics.rs
+++ b/src/librustc_metadata/diagnostics.rs
@@ -56,6 +56,20 @@ you want. Example:
 ```
 "##,
 
+E0463: r##"
+A plugin/crate was declared but cannot be found. Erroneous code example:
+
+```
+#![feature(plugin)]
+#![plugin(cookie_monster)] // error: can't find crate for `cookie_monster`
+extern crate cake_is_a_lie; // error: can't find crate for `cake_is_a_lie`
+```
+
+You need to link your code to the relevant crate in order to be able to use it
+(through Cargo or the `-L` option of rustc example). Plugins are crates as
+well, and you link to them the same way.
+"##,
+
 }
 
 register_diagnostics! {
@@ -66,7 +80,6 @@ register_diagnostics! {
     E0460, // found possibly newer version of crate `..`
     E0461, // couldn't find crate `..` with expected target triple ..
     E0462, // found staticlib `..` instead of rlib or dylib
-    E0463, // can't find crate for `..`
     E0464, // multiple matching crates for `..`
     E0465, // multiple .. candidates for `..` found
     E0466, // bad macro import