Skip to content

Commit

Permalink
Auto merge of #30264 - GuillaumeGomez:patch-5, r=Manishearth
Browse files Browse the repository at this point in the history
r? @Manishearth

Also: should I merged both commits? Not sure if it's really useful to keep the first one.
  • Loading branch information
bors committed Jan 2, 2016
2 parents 44f0208 + 55955f5 commit 4744472
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/librustc/diagnostics.rs
Expand Up @@ -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
Expand Down
15 changes: 14 additions & 1 deletion src/librustc_metadata/diagnostics.rs
Expand Up @@ -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! {
Expand All @@ -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
Expand Down

0 comments on commit 4744472

Please sign in to comment.