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

Closure argument mismatch tweaks #47573

Merged
merged 1 commit into from
Jan 21, 2018
Merged

Closure argument mismatch tweaks #47573

merged 1 commit into from
Jan 21, 2018

Conversation

estebank
Copy link
Contributor

@estebank estebank commented Jan 19, 2018 •
edited
Loading

  • use consistent phrasing for expected and found arguments
  • suggest changing arguments to tuple if possible
  • suggest changing single tuple argument to arguments if possible

Fix #44150.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

varkor
varkor reviewed Jan 19, 2018
View reviewed changes
src/librustc/traits/error_reporting.rs Outdated
ArgKind::Tuple(
span,
args.iter().map(|pat| {
let snippet = self.tcx.sess.codemap().span_to_snippet(pat.span).unwrap();
Copy link
Member

@varkor varkor Jan 19, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Tidy error for line 810.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, there're a bunch of code I'm none too happy with, I'll clean it up as much as possible before merging.

nikomatsakis
nikomatsakis approved these changes Jan 19, 2018
View reviewed changes
Copy link
Contributor

@nikomatsakis nikomatsakis left a comment

Choose a reason for hiding this comment

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

r=me once travis errors are fixed

@estebank estebank added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 19, 2018
@estebank estebank force-pushed the closures branch 3 times, most recently from ca99f6b to 0ce008a Compare January 20, 2018 05:36
@estebank
Closure argument mismatch tweaks
7ed00ca 
 - use consistent phrasing for expected and found arguments
 - suggest changing arugments to tuple if possible
 - suggest changing single tuple argument to arguments if possible
@estebank
Copy link
Contributor Author

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Jan 20, 2018

📌 Commit 7ed00ca has been approved by nikomatsakis

@estebank
Copy link
Contributor Author

@bors rollup

@estebank estebank 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 20, 2018
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jan 20, 2018
@GuillaumeGomez
Rollup merge of rust-lang#47573 - estebank:closures, r=nikomatsakis
a9672c2 
Closure argument mismatch tweaks

 - use consistent phrasing for expected and found arguments
 - suggest changing arguments to tuple if possible
 - suggest changing single tuple argument to arguments if possible

Fix rust-lang#44150.
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jan 20, 2018
Merged
bors added a commit that referenced this pull request Jan 21, 2018
@bors
Auto merge of #47622 - GuillaumeGomez:rollup, r=GuillaumeGomez
8d3e93b 
Rollup of 10 pull requests

- Successful merges: #46938, #47193, #47508, #47510, #47532, #47535, #47559, #47568, #47573, #47578
- Failed merges:
@bors bors merged commit 7ed00ca into rust-lang:master Jan 21, 2018
@kennytm kennytm mentioned this pull request Jan 25, 2018
Closed
@kennytm kennytm mentioned this pull request Feb 4, 2018
Closed
@zackmdavis zackmdavis mentioned this pull request Feb 7, 2018
Closed
@pietroalbini pietroalbini mentioned this pull request Apr 26, 2018
Closed
@estebank estebank deleted the closures branch November 9, 2023 05:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@varkor varkor varkor left review comments

@nikomatsakis nikomatsakis nikomatsakis approved these changes

Assignees

@nikomatsakis nikomatsakis

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.
5 participants
@estebank @rust-highfive @bors @nikomatsakis @varkor