Skip to content

Commit 4744472

Browse files
committed
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 parents 44f0208 + 55955f5 commit 4744472

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

src/librustc/diagnostics.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2323,9 +2323,9 @@ register_diagnostics! {
23232323
E0285, // overflow evaluation builtin bounds
23242324
E0298, // mismatched types between arms
23252325
E0299, // mismatched types between arms
2326-
E0300, // unexpanded macro
2327-
E0304, // expected signed integer constant
2328-
E0305, // expected constant
2326+
// E0300, // unexpanded macro
2327+
// E0304, // expected signed integer constant
2328+
// E0305, // expected constant
23292329
E0311, // thing may not live long enough
23302330
E0312, // lifetime of reference outlives lifetime of borrowed content
23312331
E0313, // lifetime of borrowed pointer outlives lifetime of captured variable

src/librustc_metadata/diagnostics.rs

+14-1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,20 @@ you want. Example:
5656
```
5757
"##,
5858

59+
E0463: r##"
60+
A plugin/crate was declared but cannot be found. Erroneous code example:
61+
62+
```
63+
#![feature(plugin)]
64+
#![plugin(cookie_monster)] // error: can't find crate for `cookie_monster`
65+
extern crate cake_is_a_lie; // error: can't find crate for `cake_is_a_lie`
66+
```
67+
68+
You need to link your code to the relevant crate in order to be able to use it
69+
(through Cargo or the `-L` option of rustc example). Plugins are crates as
70+
well, and you link to them the same way.
71+
"##,
72+
5973
}
6074

6175
register_diagnostics! {
@@ -66,7 +80,6 @@ register_diagnostics! {
6680
E0460, // found possibly newer version of crate `..`
6781
E0461, // couldn't find crate `..` with expected target triple ..
6882
E0462, // found staticlib `..` instead of rlib or dylib
69-
E0463, // can't find crate for `..`
7083
E0464, // multiple matching crates for `..`
7184
E0465, // multiple .. candidates for `..` found
7285
E0466, // bad macro import

0 commit comments

Comments
 (0)