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

Allow a trailing comma in lint_array #47458

Merged
merged 1 commit into from
Jan 17, 2018
Merged

Allow a trailing comma in lint_array #47458

merged 1 commit into from
Jan 17, 2018
+55 −19

Conversation

mark-i-m
Copy link
Member

fix #47428

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @estebank (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@mark-i-m
Copy link
Member Author

r? @durka

durka
durka reviewed Jan 15, 2018
View reviewed changes
src/librustc/lint/mod.rs Outdated
}
) }
macro_rules! lint_array {
($( $lint:expr ),*,) => { lint_array!( $( &$lint ),* ) };
Copy link
Contributor

Choose a reason for hiding this comment

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

Why did you add a & here?

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh, good catch... Copy/paste 🤕

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed. Thanks @durka !

@durka
Copy link
Contributor

durka commented Jan 15, 2018 •
edited
Loading

LGTM, I'm not a reviewer though. You should probably add a test for the trailing comma? Perhaps in src/test/run-pass-fulldeps/auxiliary/lint_for_crate.rs.

@mark-i-m
Copy link
Member Author

Thanks, I added a couple of tests...

@mark-i-m
Copy link
Member Author

Hmm... ok... I need to fix a couple of errors.

@mark-i-m
Copy link
Member Author

Ok, I think they should actually work now

@mark-i-m
Copy link
Member Author

@estebank ping :)

@estebank
Copy link
Contributor

@mark-i-m one final nitpick and r=me. Could you squash all your commits into one?

@mark-i-m
Copy link
Member Author

@estebank Squashed :)

Thanks!

@estebank
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 17, 2018

📌 Commit f81c2de has been approved by estebank

@kennytm kennytm added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 17, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Jan 17, 2018
@kennytm
Rollup merge of rust-lang#47458 - mark-i-m:lint_array_comma, r=estebank
4b77463 
Allow a trailing comma in lint_array

fix rust-lang#47428
@kennytm kennytm mentioned this pull request Jan 17, 2018
Closed
kennytm added a commit to kennytm/rust that referenced this pull request Jan 17, 2018
@kennytm
Rollup merge of rust-lang#47458 - mark-i-m:lint_array_comma, r=estebank
4b636d0 
Allow a trailing comma in lint_array

fix rust-lang#47428
@kennytm kennytm mentioned this pull request Jan 17, 2018
Merged
bors added a commit that referenced this pull request Jan 17, 2018
@bors
Auto merge of #47522 - kennytm:rollup, r=kennytm
0f9c784 
Rollup of 21 pull requests

- Successful merges: #47302, #47333, #47387, #47404, #47407, #47426, #47427, #47436, #47444, #47456, #47458, #47467, #47479, #47481, #47483, #47487, #47497, #47498, #47505, #47509, #47514
- Failed merges:
@bors bors merged commit f81c2de into rust-lang:master Jan 17, 2018
@mark-i-m mark-i-m deleted the lint_array_comma branch November 14, 2018 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@durka durka durka 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.

Support trailing commas in lint_array
6 participants
@mark-i-m @rust-highfive @durka @estebank @bors @kennytm