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

Make use of Servo-specific ToCss everywhere! #14089

Merged
merged 3 commits into from
Nov 7, 2016
Merged

Make use of Servo-specific ToCss everywhere! #14089

merged 3 commits into from
Nov 7, 2016

Conversation

wafflespeanut
Copy link
Contributor

@wafflespeanut wafflespeanut commented Nov 6, 2016 •
edited

This will allow types to be generic over our local ToCss

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes do not require tests because it's a refactor

This change is Reviewable

@highfive
Copy link

highfive commented Nov 6, 2016

Heads up! This PR modifies the following files:

  • @bholley: components/style/values/computed/position.rs, components/style/values/specified/basic_shape.rs, components/style/properties/longhand/background.mako.rs, components/style/properties/longhand/text.mako.rs, components/style/properties/longhand/position.mako.rs, components/style/properties/longhand/outline.mako.rs, components/style/properties/longhand/list.mako.rs, components/style/properties/properties.mako.rs, components/style/viewport.rs, components/style/values/specified/image.rs, components/style/values/computed/basic_shape.rs, components/style/values/computed/image.rs, components/style/properties/longhand/font.mako.rs, components/style/properties/longhand/pointing.mako.rs, components/style/properties/longhand/inherited_box.mako.rs, components/style/properties/longhand/inherited_text.mako.rs, components/style/properties/longhand/effects.mako.rs, components/style/properties/longhand/svg.mako.rs, components/style/values/specified/mod.rs, components/style/properties/longhand/counters.mako.rs, components/style/properties/declaration_block.rs, components/style/values/computed/mod.rs, components/style/properties/longhand/border.mako.rs, components/style/properties/longhand/box.mako.rs, components/style/custom_properties.rs, components/style/properties/shorthand/serialize.mako.rs, components/style/values/mod.rs, components/style/properties/helpers.mako.rs, components/style/properties/longhand/inherited_table.mako.rs, components/style/properties/helpers/animated_properties.mako.rs, components/style/properties/longhand/column.mako.rs, components/style/values/specified/position.rs
  • @emilio: components/style/values/computed/position.rs, components/style/values/specified/basic_shape.rs, components/style/properties/longhand/background.mako.rs, ports/geckolib/Cargo.lock, components/style/properties/longhand/text.mako.rs, components/style/properties/longhand/position.mako.rs, ports/geckolib/glue.rs, components/style/properties/longhand/outline.mako.rs, components/style/properties/longhand/list.mako.rs, components/style/properties/properties.mako.rs, components/style/viewport.rs, components/style/values/specified/image.rs, components/style/values/computed/basic_shape.rs, components/style/values/computed/image.rs, components/style/properties/longhand/font.mako.rs, components/style/properties/longhand/pointing.mako.rs, components/style/properties/longhand/inherited_box.mako.rs, components/style/properties/longhand/inherited_text.mako.rs, components/style/properties/longhand/effects.mako.rs, components/style/properties/longhand/svg.mako.rs, components/style/values/specified/mod.rs, components/style/properties/longhand/counters.mako.rs, components/style/properties/declaration_block.rs, components/style/values/computed/mod.rs, components/style/properties/longhand/border.mako.rs, components/style/properties/longhand/box.mako.rs, components/style/custom_properties.rs, components/style/properties/shorthand/serialize.mako.rs, components/style/values/mod.rs, components/style/properties/helpers.mako.rs, components/style/properties/longhand/inherited_table.mako.rs, components/style/properties/helpers/animated_properties.mako.rs, components/style/properties/longhand/column.mako.rs, components/style/values/specified/position.rs

@highfive
Copy link

highfive commented Nov 6, 2016

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 Nov 6, 2016
@wafflespeanut
Copy link
Contributor Author

r? @SimonSapin

@highfive highfive assigned SimonSapin and unassigned KiChjang Nov 6, 2016
@wafflespeanut
Copy link
Contributor Author

wafflespeanut commented Nov 6, 2016 •
edited

Okay, I just rebased. Both the builds succeed right now.

@wafflespeanut
Copy link
Contributor Author

wafflespeanut commented Nov 6, 2016 •
edited

Also, currently, I've re-exported ToCss from values module, because when I began this, the idea was to make use of ToCss from values. Now, all the modules should make use of style_traits::ToCss.

@wafflespeanut
Copy link
Contributor Author

This is ready for review! :)

@SimonSapin
Copy link
Member

@bors-servo r+

Reviewed 5 of 6 files at r1, 43 of 43 files at r2.
Review status: all files reviewed at latest revision, all discussions resolved, some commit checks failed.

Comments from Reviewable

@bors-servo
Copy link
Contributor

📌 Commit 4df9824 has been approved by SimonSapin

@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 Nov 6, 2016
@wafflespeanut
Copy link
Contributor Author

@bors-servo r-

Oops. Just noticed the build failure in Travis. Gotta update the tests. Sorry 😞

@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Nov 6, 2016
@wafflespeanut
Copy link
Contributor Author

@bors-servo r=SimonSapin

@bors-servo
Copy link
Contributor

📌 Commit 173a866 has been approved by SimonSapin

@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 Nov 6, 2016
@bors-servo
Copy link
Contributor

⌛ Testing commit 173a866 with merge e2d3fcd...

bors-servo pushed a commit that referenced this pull request Nov 6, 2016
Auto merge of #14089 - Wafflespeanut:tocss, r=SimonSapin
e2d3fcd 
Make use of Servo-specific ToCss everywhere!

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

This will allow types to be generic over our local `ToCss`

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors

<!-- Either: -->
- [x] These changes do not require tests because it's a refactor

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

💔 Test failed - linux-dev

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Nov 6, 2016
@wafflespeanut
Copy link
Contributor Author

Lockfile (sigh)

@bors-servo
Copy link
Contributor

💔 Test failed - windows-dev

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Nov 6, 2016
@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels Nov 7, 2016
@wafflespeanut
Copy link
Contributor Author

@bors-servo r=SimonSapin

@bors-servo
Copy link
Contributor

📌 Commit 5ac1c11 has been approved by SimonSapin

@highfive highfive removed the S-awaiting-review There is new code that needs to be reviewed. label Nov 7, 2016
@bors-servo
Copy link
Contributor

⌛ Testing commit 5ac1c11 with merge 2f92fcb...

@highfive highfive added the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Nov 7, 2016
bors-servo pushed a commit that referenced this pull request Nov 7, 2016
Auto merge of #14089 - Wafflespeanut:tocss, r=SimonSapin
2f92fcb 
Make use of Servo-specific ToCss everywhere!

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

This will allow types to be generic over our local `ToCss`

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors

<!-- Either: -->
- [x] These changes do not require tests because it's a refactor

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

💔 Test failed - linux-rel-wpt

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Nov 7, 2016
@wafflespeanut
Copy link
Contributor Author

@bors-servo retry #14103

@bors-servo
Copy link
Contributor

⌛ Testing commit 5ac1c11 with merge f48b3fe...

bors-servo pushed a commit that referenced this pull request Nov 7, 2016
Auto merge of #14089 - Wafflespeanut:tocss, r=SimonSapin
f48b3fe 
Make use of Servo-specific ToCss everywhere!

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

This will allow types to be generic over our local `ToCss`

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors

<!-- Either: -->
- [x] These changes do not require tests because it's a refactor

<!-- 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/14089)
<!-- Reviewable:end -->
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Nov 7, 2016
@bors-servo
Copy link
Contributor

☀️ Test successful - arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-dev

@bors-servo bors-servo merged commit 5ac1c11 into servo:master Nov 7, 2016
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Nov 7, 2016
@bors-servo bors-servo mentioned this pull request Nov 7, 2016
Merged
3 tasks
@wafflespeanut wafflespeanut deleted the tocss branch November 7, 2016 06:40
@wafflespeanut wafflespeanut mentioned this pull request Nov 8, 2016
Merged
4 tasks
This was referenced Nov 8, 2016
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@SimonSapin SimonSapin

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@wafflespeanut @highfive @SimonSapin @bors-servo @KiChjang