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

Update syn and bump version #229

Merged
merged 1 commit into from Nov 5, 2018
Merged

Update syn and bump version #229

merged 1 commit into from Nov 5, 2018

Conversation

@Eijebong
Copy link
Member

Eijebong commented Oct 16, 2018

This change is Reviewable

@@ -27,20 +29,18 @@ pub fn expand(from: &Path, to: &Path) {

struct MatchByte {
expr: syn::Expr,
arms: Vec<syn::Arm>,
_comma: Token![,],
arms: Punctuated<syn::Arm, Option<Token![,]>>,

This comment has been minimized.

@dtolnay

dtolnay Oct 16, 2018

The Arm parser will always eat a trailing comma if there is one, so the one here will always be None (unless the user writes a double comma, which we would want to reject). https://github.com/dtolnay/syn/blob/0.15.12/src/expr.rs#L2777-L2781. The comma will go in https://docs.rs/syn/0.15/syn/struct.Arm.html#structfield.comma.

I would recommend parsing these as Vec<Arm> as seen in https://github.com/dtolnay/syn/blob/0.15.12/src/expr.rs#L1898-L1901.

@@ -27,20 +29,18 @@ pub fn expand(from: &Path, to: &Path) {

struct MatchByte {
expr: syn::Expr,
arms: Vec<syn::Arm>,
_comma: Token![,],

This comment has been minimized.

@dtolnay

dtolnay Oct 16, 2018

I would leave this out of the struct if it won't be used.

@Eijebong Eijebong force-pushed the Eijebong:synup branch from 9907849 to 0584df8 Oct 16, 2018
@Eijebong Eijebong mentioned this pull request Nov 1, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Nov 5, 2018

The latest upstream changes (presumably #230) made this pull request unmergeable. Please resolve the merge conflicts.

@SimonSapin SimonSapin force-pushed the Eijebong:synup branch from 0584df8 to 0fa24f3 Nov 5, 2018
@SimonSapin
Copy link
Member

SimonSapin commented Nov 5, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Nov 5, 2018

📌 Commit 0fa24f3 has been approved by SimonSapin

@bors-servo
Copy link
Contributor

bors-servo commented Nov 5, 2018

Testing commit 0fa24f3 with merge 0eacf09...

bors-servo added a commit that referenced this pull request Nov 5, 2018
Update syn and bump version

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-cssparser/229)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 5, 2018

☀️ Test successful - status-travis
Approved by: SimonSapin
Pushing 0eacf09 to master...

@bors-servo bors-servo merged commit 0fa24f3 into servo:master Nov 5, 2018
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@SimonSapin
Copy link
Member

SimonSapin commented Nov 5, 2018

bors-servo added a commit to servo/servo that referenced this pull request Nov 30, 2018
Update syn

- servo/html5ever#353
- servo/rust-cssparser#229
- servo/webrender#3264
- servo/media#162
- rust-lang/rust-bindgen#1409

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22085)
<!-- Reviewable:end -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.