Skip to content

Commit 0805deb

Browse files
---
yaml --- r: 218326 b: refs/heads/tmp c: 6f01aa0 h: refs/heads/master v: v3
1 parent 7738d0e commit 0805deb

File tree

2 files changed

+19
-4
lines changed

2 files changed

+19
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
2626
refs/heads/beta: ebf0c83cb9c6508e9564cb58337df2ad52b56430
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
28-
refs/heads/tmp: c01c1fd715bc2a61a250d53f8bc50299078c010c
28+
refs/heads/tmp: 6f01aa0fc8c7d74fb51e20444d9c51ce707a1de4
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: d0fdfbfb0d34f196f52b9d15215723c4785c4afa
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828

branches/tmp/src/librustc_typeck/diagnostics.rs

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1563,7 +1563,7 @@ type Foo = Trait; // error: the value of the associated type `Bar` (from
15631563
// the trait `Trait`) must be specified
15641564
```
15651565
1566-
Please verify you specified all associated types of the trait or that you
1566+
Please verify you specified all associated types of the trait and that you
15671567
used the right trait. Example:
15681568
15691569
```
@@ -1869,7 +1869,7 @@ type Foo = Trait<F=i32>; // error: associated type `F` not found for
18691869
// `Trait`
18701870
```
18711871
1872-
Please verify you used the good trait or you didn't mispelled the
1872+
Please verify you used the right trait or you didn't misspell the
18731873
associated type name. Example:
18741874
18751875
```
@@ -1881,6 +1881,22 @@ type Foo = Trait<Bar=i32>; // ok!
18811881
```
18821882
"##,
18831883

1884+
E0232: r##"
1885+
The attribute must have a value. Erroneous code example:
1886+
1887+
```
1888+
#[rustc_on_unimplemented] // error: this attribute must have a value
1889+
trait Bar {}
1890+
```
1891+
1892+
Please supply the missing value of the attribute. Example:
1893+
1894+
```
1895+
#[rustc_on_unimplemented = "foo"] // ok!
1896+
trait Bar {}
1897+
```
1898+
"##,
1899+
18841900
E0243: r##"
18851901
This error indicates that not enough type parameters were found in a type or
18861902
trait.
@@ -2153,7 +2169,6 @@ register_diagnostics! {
21532169
E0229, // associated type bindings are not allowed here
21542170
E0230, // there is no type parameter on trait
21552171
E0231, // only named substitution parameters are allowed
2156-
E0232, // this attribute must have a value
21572172
E0233,
21582173
E0234,
21592174
E0235, // structure constructor specifies a structure of type but

0 commit comments

Comments
 (0)