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.

Sign up for GitHub

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

Jump to bottom

fix span for invalid number of parameters in trait method #56641

Merged
merged 1 commit into from
Dec 11, 2018
Merged

fix span for invalid number of parameters in trait method #56641

merged 1 commit into from
Dec 11, 2018

Conversation

GuillaumeGomez
Copy link
Member

Fixes #56582.

@rust-highfive
Copy link
Collaborator

r? @estebank

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 8, 2018
estebank
estebank reviewed Dec 10, 2018
View reviewed changes
src/test/ui/trait-method-number-parameters.stderr
...
LL | / &mut self, //~ ERROR
LL | | x: i32,
| |______________^ expected 3 parameters, found 2
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this could be tweaked to actually include either the fn signature or the entire block in order to provide enough context when generating this error in the terminal, but that would be a good follow up tweak.

@estebank
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 10, 2018

📌 Commit 05cea31 has been approved by estebank

@bors bors 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 Dec 10, 2018
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Dec 10, 2018
@GuillaumeGomez
Rollup merge of rust-lang#56641 - GuillaumeGomez:span-trait-method-in…
b37ad66 
…valid-nb-parameters, r=estebank

fix span for invalid number of parameters in trait method

Fixes rust-lang#56582.
@GuillaumeGomez GuillaumeGomez mentioned this pull request Dec 10, 2018
Merged
bors added a commit that referenced this pull request Dec 10, 2018
@bors
Auto merge of #56688 - GuillaumeGomez:rollup, r=GuillaumeGomez
da1527c 
Rollup of 5 pull requests

Successful merges:

 - #56491 (emit error with span for empty asserts)
 - #56633 (Fix right arrow size for crate filter)
 - #56641 (fix span for invalid number of parameters in trait method)
 - #56656 (Fix typo)
 - #56661 (Add regression test for ICE)

Failed merges:

r? @ghost
@bors bors merged commit 05cea31 into rust-lang:master Dec 11, 2018
@GuillaumeGomez GuillaumeGomez deleted the span-trait-method-invalid-nb-parameters branch December 11, 2018 08:58
@SimonSapin SimonSapin mentioned this pull request Dec 27, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@estebank estebank estebank left review comments

Assignees

@estebank estebank

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@GuillaumeGomez @rust-highfive @estebank @bors