Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tweak presentation on lifetime trait mismatch #47791

Merged
merged 3 commits into from
Feb 3, 2018

Conversation

estebank
Copy link
Contributor

@estebank estebank commented Jan 27, 2018

  • On trait/impl method discrepancy, add label pointing at trait signature.
  • Point only at method definition when referring to named lifetimes on lifetime mismatch.
  • When the sub and sup expectations are the same, tweak the output to avoid repeated spans.

Fix #30790, CC #18759.

@rust-highfive
Copy link
Collaborator

r? @michaelwoerister

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

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 27, 2018
When refering to named lifetime conflict, point only at the method's
signature span instead of the entire method.

When the expected and found sup and sub traces are the same, avoid
redundant text.
 - On mismatch between impl and trait method, point at the trait
   signature.
 - Point only at the method signature instead of the whole body on
   trait/impl mismatch errors.
@estebank
Copy link
Contributor Author

r? @nikomatsakis

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jan 29, 2018

📌 Commit 67696be has been approved by nikomatsakis

@kennytm kennytm 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 Jan 30, 2018
@bors
Copy link
Contributor

bors commented Feb 2, 2018

⌛ Testing commit 67696be with merge 1f8e6fa722cdc6f115d02703a84079a414c70997...

@bors
Copy link
Contributor

bors commented Feb 2, 2018

💔 Test failed - status-appveyor

@kennytm
Copy link
Member

kennytm commented Feb 2, 2018

@bors retry #46903

@bors
Copy link
Contributor

bors commented Feb 3, 2018

⌛ Testing commit 67696be with merge 6c15dff...

bors added a commit that referenced this pull request Feb 3, 2018
Tweak presentation on lifetime trait mismatch

 - On trait/impl method discrepancy, add label pointing at trait signature.
 - Point only at method definition when referring to named lifetimes on lifetime mismatch.
 - When the sub and sup expectations are the same, tweak the output to avoid repeated spans.

Fix #30790, CC #18759.
@bors
Copy link
Contributor

bors commented Feb 3, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 6c15dff to master...

@bors bors merged commit 67696be into rust-lang:master Feb 3, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: 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