user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #53295 - estebank:on-unimplemented, r=michaelwoerister

Browse source 
Various changes to `rustc_on_unimplemented`

- Add `from_method` and `from_desugaring` to formatting options
- Change wording of errors slightly
This commit is contained in:
bors 2018-08-16 06:34:13 +00:00
commit 996e26c23f
4 changed files with 38 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/ui/error-codes/E0232.stderr
View file

@ -4,7 +4,7 @@ error[E0232]: `#[rustc_on_unimplemented]` requires a value
LL | #[rustc_on_unimplemented]
| ^^^^^^^^^^^^^^^^^^^^^^^^^ value required here
|
= note: eg `#[rustc_on_unimplemented = "foo"]`
= note: eg `#[rustc_on_unimplemented(message="foo")]`
error: aborting due to previous error

2
src/test/ui/on-unimplemented/bad-annotation.rs
View file

@ -28,7 +28,7 @@ trait BadAnnotation1
{}
#[rustc_on_unimplemented = "Unimplemented trait error on `{Self}` with params `<{A},{B},{C}>`"]
//~^ ERROR there is no parameter C on trait BadAnnotation2
//~^ ERROR there is no parameter `C` on trait `BadAnnotation2`
trait BadAnnotation2<A,B>
{}

16
src/test/ui/on-unimplemented/bad-annotation.stderr
View file

@ -4,9 +4,9 @@ error[E0232]: `#[rustc_on_unimplemented]` requires a value
LL | #[rustc_on_unimplemented] //~ ERROR `#[rustc_on_unimplemented]` requires a value
| ^^^^^^^^^^^^^^^^^^^^^^^^^ value required here
|
= note: eg `#[rustc_on_unimplemented = "foo"]`
= note: eg `#[rustc_on_unimplemented(message="foo")]`
error[E0230]: there is no parameter C on trait BadAnnotation2
error[E0230]: there is no parameter `C` on trait `BadAnnotation2`
--> $DIR/bad-annotation.rs:30:1
|
LL | #[rustc_on_unimplemented = "Unimplemented trait error on `{Self}` with params `<{A},{B},{C}>`"]
@ -24,7 +24,7 @@ error[E0232]: this attribute must have a valid value
LL | #[rustc_on_unimplemented(lorem="")]
| ^^^^^^^^ expected value here
|
= note: eg `#[rustc_on_unimplemented = "foo"]`
= note: eg `#[rustc_on_unimplemented(message="foo")]`
error[E0232]: this attribute must have a valid value
--> $DIR/bad-annotation.rs:44:26
@ -32,7 +32,7 @@ error[E0232]: this attribute must have a valid value
LL | #[rustc_on_unimplemented(lorem(ipsum(dolor)))]
| ^^^^^^^^^^^^^^^^^^^ expected value here
|
= note: eg `#[rustc_on_unimplemented = "foo"]`
= note: eg `#[rustc_on_unimplemented(message="foo")]`
error[E0232]: this attribute must have a valid value
--> $DIR/bad-annotation.rs:48:39
@ -40,7 +40,7 @@ error[E0232]: this attribute must have a valid value
LL | #[rustc_on_unimplemented(message="x", message="y")]
| ^^^^^^^^^^^ expected value here
|
= note: eg `#[rustc_on_unimplemented = "foo"]`
= note: eg `#[rustc_on_unimplemented(message="foo")]`
error[E0232]: this attribute must have a valid value
--> $DIR/bad-annotation.rs:52:39
@ -48,7 +48,7 @@ error[E0232]: this attribute must have a valid value
LL | #[rustc_on_unimplemented(message="x", on(desugared, message="y"))]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected value here
|
= note: eg `#[rustc_on_unimplemented = "foo"]`
= note: eg `#[rustc_on_unimplemented(message="foo")]`
error[E0232]: empty `on`-clause in `#[rustc_on_unimplemented]`
--> $DIR/bad-annotation.rs:56:26
@ -62,7 +62,7 @@ error[E0232]: this attribute must have a valid value
LL | #[rustc_on_unimplemented(on="x", message="y")]
| ^^^^^^ expected value here
|
= note: eg `#[rustc_on_unimplemented = "foo"]`
= note: eg `#[rustc_on_unimplemented(message="foo")]`
error[E0232]: this attribute must have a valid value
--> $DIR/bad-annotation.rs:67:40
@ -70,7 +70,7 @@ error[E0232]: this attribute must have a valid value
LL | #[rustc_on_unimplemented(on(desugared, on(desugared, message="x")), message="y")]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected value here
|
= note: eg `#[rustc_on_unimplemented = "foo"]`
= note: eg `#[rustc_on_unimplemented(message="foo")]`
error: aborting due to 10 previous errors