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

style: Have OneOrMoreSeparated replace OneOrMoreCommaSeparated. #17414

Merged
merged 1 commit into from
Jun 20, 2017

Conversation

jyc
Copy link
Contributor

@jyc jyc commented Jun 19, 2017

NOTE The alternative for me is just to duplicate the ToCss code, which is not bad and is less code changed! Don't know what others would think, though. Looking for feedback!

A future patch series has some values that should be separated by spaces. This
allows us to re-use the code for serialization, but the types do get a little
clunky. The separator is now indicated with an associated type.


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #__ (github issue number if applicable).
  • There are tests for these changes OR
  • These changes do not require tests because they shoudl be tested by existing serialization code

This change is Reviewable

@highfive
Copy link

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

@highfive
Copy link

Heads up! This PR modifies the following files:

  • @bholley: components/style/parser.rs, components/style/counter_style/mod.rs, components/style/font_face.rs, components/style/values/generics/mod.rs
  • @emilio: components/style/parser.rs, components/style/counter_style/mod.rs, components/style/font_face.rs, components/style/values/generics/mod.rs

@highfive
Copy link

warning Warning warning

  • These commits modify style code, but no tests are modified. Please consider adding a test!

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jun 19, 2017
@jyc jyc force-pushed the space-separator branch 2 times, most recently from b423e07 to 3cec904 Compare June 19, 2017 23:08
A future patch series has some values that should be separated by spaces. This
allows us to re-use the code for serialization, but the types do get a little
clunky. The separator is now indicated with an associated type.
@jyc
Copy link
Contributor Author

jyc commented Jun 19, 2017

Got rid of the empty type stuff.

@emilio emilio changed the title [WIP] style: Have OneOrMoreSeparated replace OneOrMoreCommaSeparated. style: Have OneOrMoreSeparated replace OneOrMoreCommaSeparated. Jun 20, 2017
@emilio
Copy link
Member

emilio commented Jun 20, 2017

r? @nox

I know you had plans for stuff like css(separator) or stuff like that, so not sure how that's coming along. This looks reasonable to me in the meantime otherwise.

@highfive highfive assigned nox and unassigned emilio Jun 20, 2017
@nox
Copy link
Contributor

nox commented Jun 20, 2017

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 26179b3 has been approved by nox

@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 Jun 20, 2017
@bors-servo
Copy link
Contributor

⌛ Testing commit 26179b3 with merge 40a3826...

bors-servo pushed a commit that referenced this pull request Jun 20, 2017
style: Have OneOrMoreSeparated replace OneOrMoreCommaSeparated.

**NOTE** The alternative for me is just to duplicate the ToCss code, which is not bad and is less code changed! Don't know what others would think, though. Looking for feedback!

A future patch series has some values that should be separated by spaces. This
allows us to re-use the code for serialization, but the types do get a little
clunky. The separator is now indicated with an associated type.

<!-- Please describe your changes on the following line: -->

---
<!-- 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
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because they shoudl be tested by existing serialization code

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- 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/17414)
<!-- 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-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: nox
Pushing 40a3826 to master...

@bors-servo bors-servo merged commit 26179b3 into servo:master Jun 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 Jun 20, 2017
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.

None yet

5 participants