Skip to content

Commit 15c9f44

Browse files
committed
Rollup merge of rust-lang#25200 - nham:E0062_E0063, r=alexcrichton
cc rust-lang#24407
2 parents dc630d0 + df64e05 commit 15c9f44

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

src/librustc/diagnostics.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,12 @@ fn main() {
271271
See also http://doc.rust-lang.org/book/unsafe.html
272272
"##,
273273

274+
E0137: r##"
275+
This error indicates that the compiler found multiple functions with the
276+
#[main] attribute. This is an error because there must be a unique entry point
277+
into a Rust program.
278+
"##,
279+
274280
E0152: r##"
275281
Lang items are already implemented in the standard library. Unless you are
276282
writing a free-standing application (e.g. a kernel), you do not need to provide
@@ -800,7 +806,6 @@ register_diagnostics! {
800806
E0134,
801807
E0135,
802808
E0136,
803-
E0137,
804809
E0138,
805810
E0139,
806811
E0261, // use of undeclared lifetime name

src/librustc_typeck/diagnostics.rs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,18 @@ let x_is_nonzero = x as bool;
3434
```
3535
"##,
3636

37+
E0062: r##"
38+
This error indicates that during an attempt to build a struct or struct-like
39+
enum variant, one of the fields was specified more than once. Each field should
40+
be specified exactly one time.
41+
"##,
42+
43+
E0063: r##"
44+
This error indicates that during an attempt to build a struct or struct-like
45+
enum variant, one of the fields was not provided. Each field should be specified
46+
exactly once.
47+
"##,
48+
3749
E0081: r##"
3850
Enum discriminants are used to differentiate enum variants stored in memory.
3951
This error indicates that the same value was used for two or more variants,
@@ -136,8 +148,6 @@ register_diagnostics! {
136148
E0059,
137149
E0060,
138150
E0061,
139-
E0062,
140-
E0063,
141151
E0066,
142152
E0067,
143153
E0068,

0 commit comments

Comments
 (0)