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

Fix parsing methods of column-{gap,width} #15662

Merged
merged 1 commit into from Feb 20, 2017
Merged

Conversation

canova
Copy link
Contributor

@canova canova commented Feb 20, 2017

They weren't accepting {normal, auto} keywords. Fixed parsing methods of these properties.


  • There are tests for these changes

This change is Reviewable

@highfive
Copy link

Heads up! This PR modifies the following files:

  • @bholley: components/style/properties/gecko.mako.rs, components/style/gecko/values.rs, components/style/properties/longhand/column.mako.rs
  • @emilio: components/style/properties/gecko.mako.rs, components/style/gecko/values.rs, components/style/properties/longhand/column.mako.rs

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Feb 20, 2017
@canova
Copy link
Contributor Author

canova commented Feb 20, 2017

r? @upsuper or @Manishearth

@highfive highfive assigned upsuper and unassigned nox Feb 20, 2017
Copy link
Member

@emilio emilio left a comment

Choose a reason for hiding this comment

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

Looks good to me. r=me with that question addressed.

Thanks for doing this! :)

spec="https://drafts.csswg.org/css-multicol/#propdef-column-gap">
use std::fmt;
use style_traits::ToCss;
use values::HasViewportPercentage;
Copy link
Member

Choose a reason for hiding this comment

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

Are these imports really necessary? huh

@emilio
Copy link
Member

emilio commented Feb 20, 2017

@bors-servo delegate+

@bors-servo
Copy link
Contributor

✌️ @canaltinova can now approve this pull request

@canova
Copy link
Contributor Author

canova commented Feb 20, 2017

@emilio After discussing with @Manishearth, I reverted changes on longhands. Instead deleted previous generic parse_non_negative_length and implemented specific parse functions. This looks cleaner I think. Could you review this again?

@Manishearth
Copy link
Member

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 19978f2 has been approved by Manishearth

@highfive highfive assigned Manishearth and unassigned upsuper Feb 20, 2017
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Feb 20, 2017
@bors-servo
Copy link
Contributor

⌛ Testing commit 19978f2 with merge f86e711...

bors-servo pushed a commit that referenced this pull request Feb 20, 2017
Fix parsing methods of column-{gap,width}

<!-- Please describe your changes on the following line: -->
They weren't accepting {normal, auto} keywords. Fixed parsing methods of these properties.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #15088 (github issue number if applicable).

<!-- Either: -->
- [X] There are tests for these changes

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/15662)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-gnu-dev, windows-msvc-dev
Approved by: Manishearth
Pushing f86e711 to master...

@bors-servo bors-servo merged commit 19978f2 into servo:master Feb 20, 2017
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Feb 20, 2017
@canova canova deleted the column branch February 20, 2017 19:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

column-{gap,width} doesn't recognize keyword values
7 participants