nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-28 01:34:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
r? @Manishearth

Also: should I merged both commits? Not sure if it's really useful to keep the first one.
This commit is contained in:
bors 2016-01-02 16:56:15 +00:00
commit 4744472fe0
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustc/diagnostics.rs
View File

@ -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

15
src/librustc_metadata/diagnostics.rs
View File

@ -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