Skip to content

Show trait method signature when impl differs - #42362

Merged
bors merged 1 commit into
rust-lang:masterfrom
estebank:type
Jun 4, 2017
Merged

Show trait method signature when impl differs#42362
bors merged 1 commit into
rust-lang:masterfrom
estebank:type

Conversation

@estebank

Copy link
Copy Markdown
Contributor

When the trait's span is available, it is already being used, add a
note for the cases where the span isn't available:

error[E0053]: method `fmt` has an incompatible type for trait
--> $DIR/trait_type.rs:17:4
|
17 | fn fmt(&self, x: &str) -> () { }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ types differ in mutability
|
= note: expected type `fn(&MyType, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error>`
found type `fn(&MyType, &str)`
error[E0050]: method `fmt` has 1 parameter but the declaration in trait `std::fmt::Display::fmt` has 2
--> $DIR/trait_type.rs:21:11
|
21 | fn fmt(&self) -> () { }
| ^^^^^ expected 2 parameters, found 1
|
= note: `fmt` from trait: `fn(&Self, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error>`
error[E0186]: method `fmt` has a `&self` declaration in the trait, but not in the impl
--> $DIR/trait_type.rs:25:4
|
25 | fn fmt() -> () { }
| ^^^^^^^^^^^^^^^^^^ expected `&self` in impl
|
= note: `fmt` from trait: `fn(&Self, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error>`
error[E0046]: not all trait items implemented, missing: `fmt`
--> $DIR/trait_type.rs:28:1
|
28 | impl std::fmt::Display for MyType4 {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `fmt` in implementation
|
= note: `fmt` from trait: `fn(&Self, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error>`

Fix#28011.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @arielb1

(rust_highfive has picked a reviewer for you, use r? to override)

@shepmaster

Copy link
Copy Markdown
Member

Thanks @estebank ! We'll get a wonderful reviewer like @arielb1 or someone equally awesome on the case.

@shepmastershepmaster added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 2, 2017
Comment threadsrc/librustc/ty/mod.rs Outdated

@arielb1arielb1Jun 3, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why the .0? It looks like a skip_binder that makes functions show as fn(&Self) rather than for<'a> fn(&'a Self). Could it be changed to skip_binder?

@arielb1

Copy link
Copy Markdown
Contributor

Nice! r+ with skip_binder and comment instead of .0 (yes I know the .0 is in the original).

@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors r=arielb1

@bors

bors commented Jun 4, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 98885c5 has been approved by arielb1

@Mark-SimulacrumMark-Simulacrum added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 4, 2017
@arielb1

arielb1 commented Jun 4, 2017

Copy link
Copy Markdown
Contributor

@bors r-

with skip_binder and comment instead of .0

There should be comments for all skip_binder calls. For example, here we would want

pubfnsignature<'a,'tcx>(&self,tcx:&TyCtxt<'a,'tcx,'tcx>) -> String{matchself.kind{
ty::AssociatedKind::Method => {format!("{}",// We skip the binder here because the binder would deanonymize all// late-bound regions, and we don't want method signatures to show up// `as for<'r> fn(&'r MyType)`. Pretty-printing handles late-bound// regions just fine, showing `fn(&MyType)`.
tcx.type_of(self.def_id).fn_sig().skip_binder())}
ty::AssociatedKind::Type => format!("type {};",self.name.to_string()),
ty::AssociatedKind::Const => {format!("const {}: {:?};",self.name.to_string(), tcx.type_of(self.def_id))}}
+ }

When the trait's span is available, it is already being used, add a
`note` for the cases where the span isn't available:
```
error[E0053]: method `fmt` has an incompatible type for trait
--> $DIR/trait_type.rs:17:4
|
17 | fn fmt(&self, x: &str) -> () { }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ types differ in mutability
|
= note: expected type `fn(&MyType, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error>`
found type `fn(&MyType, &str)`
error[E0050]: method `fmt` has 1 parameter but the declaration in trait `std::fmt::Display::fmt` has 2
--> $DIR/trait_type.rs:21:11
|
21 | fn fmt(&self) -> () { }
| ^^^^^ expected 2 parameters, found 1
|
= note: `fmt` from trait: `fn(&Self, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error>`
error[E0186]: method `fmt` has a `&self` declaration in the trait, but not in the impl
--> $DIR/trait_type.rs:25:4
|
25 | fn fmt() -> () { }
| ^^^^^^^^^^^^^^^^^^ expected `&self` in impl
|
= note: `fmt` from trait: `fn(&Self, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error>`
error[E0046]: not all trait items implemented, missing: `fmt`
--> $DIR/trait_type.rs:28:1
|
28 | impl std::fmt::Display for MyType4 {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `fmt` in implementation
|
= note: `fmt` from trait: `fn(&Self, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error>`
```
@estebank

Copy link
Copy Markdown
ContributorAuthor

@arielb1 forgot about the comment. Added the one proposed.

@bors r=arielb1

@bors

bors commented Jun 4, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit e324919 has been approved by arielb1

@bors

bors commented Jun 4, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e324919 with merge 0418fa9...

bors added a commit that referenced this pull request Jun 4, 2017
Show trait method signature when impl differs
When the trait's span is available, it is already being used, add a
`note` for the cases where the span isn't available:
<pre>
error[E0053]: <b>method `fmt` has an incompatible type for trait</b>
--> $DIR/trait_type.rs:17:4
|
17 | fn fmt(&self, x: &str) -> () { }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ types differ in mutability
|
= note: expected type `<b>fn(&MyType, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error></b>`
found type `<b>fn(&MyType, &str)</b>`
error[E0050]: <b>method `fmt` has 1 parameter but the declaration in trait `std::fmt::Display::fmt` has 2</b>
--> $DIR/trait_type.rs:21:11
|
21 | fn fmt(&self) -> () { }
| ^^^^^ expected 2 parameters, found 1
|
= note: `fmt` from trait: `<b>fn(&Self, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error></b>`
error[E0186]: <b>method `fmt` has a `&self` declaration in the trait, but not in the impl</b>
--> $DIR/trait_type.rs:25:4
|
25 | fn fmt() -> () { }
| ^^^^^^^^^^^^^^^^^^ expected `&self` in impl
|
= note: `fmt` from trait: `<b>fn(&Self, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error></b>`
error[E0046]: <b>not all trait items implemented, missing: `fmt`</b>
--> $DIR/trait_type.rs:28:1
|
28 | impl std::fmt::Display for MyType4 {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `fmt` in implementation
|
= note: `fmt` from trait: `<b>fn(&Self, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error></b>`
</code></pre>
Fix#28011.
@bors

bors commented Jun 4, 2017

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: arielb1
Pushing 0418fa9 to master...

@bors
bors merged commit e324919 into rust-lang:masterJun 4, 2017
@estebank
estebank deleted the type branch November 9, 2023 05:26
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@estebank@rust-highfive@shepmaster@arielb1@Mark-Simulacrum@bors