Skip to content

/ servo

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

Use generics for the vertical-align property #18301

Merged
merged 1 commit into from Aug 31, 2017
Merged

Use generics for the vertical-align property #18301

merged 1 commit into from Aug 31, 2017

Conversation

@nox
Copy link
Member

nox commented Aug 29, 2017 •
edited by SimonSapin

This change is Reviewable
@highfive
Copy link

highfive commented Aug 29, 2017

Heads up! This PR modifies the following files:

  • @bholley: components/style/values/specified/box.rs, components/style/gecko/conversions.rs, components/style/values/generics/box.rs, components/style/values/specified/mod.rs, components/style/properties/gecko.mako.rs and 4 more
  • @canaltinova: components/style/values/specified/box.rs, components/style/gecko/conversions.rs, components/style/values/generics/box.rs, components/style/values/specified/mod.rs, components/style/properties/gecko.mako.rs and 4 more
  • @emilio: components/style/values/specified/box.rs, components/layout/fragment.rs, components/style/gecko/conversions.rs, components/style/values/generics/box.rs, components/style/values/specified/mod.rs and 7 more
@highfive
Copy link

highfive commented Aug 29, 2017

warning Warning warning

  • These commits modify style and layout code, but no tests are modified. Please consider adding a test!
@nox
Copy link
Member Author

nox commented Aug 29, 2017

r? @emilio

Will do a geckotry tomorrow.
@highfive highfive assigned emilio and unassigned metajack Aug 29, 2017
@jdm
Copy link
Member

jdm commented Aug 29, 2017 

 couldn't read "C:\\projects\\servo\\components\\style\\values\\computed\\box.rs": The system cannot find the file specified. (os error 2)
  --> C:\projects\servo\components\style\values\computed\mod.rs:65:9
   |
65 | pub mod box_;
   |         ^^^^
error: aborting due to previous error
error: Could not compile `style`.
@nox nox force-pushed the derive-all-the-things branch 2 times, most recently from aad71a9 to e0a0c4a Aug 29, 2017
@nox
Copy link
Member Author

nox commented Aug 30, 2017

https://treeherder.mozilla.org/#/jobs?repo=try&revision=1edf1e2a1227b73388d8c4ecf936f1bd305f04e3
@emilio
emilio approved these changes Aug 30, 2017
View changes
@emilio
Copy link
Member

emilio commented Aug 30, 2017

Wonderful :)
@bors-servo
Copy link
Contributor

bors-servo commented Aug 30, 2017

☔ The latest upstream changes (presumably #18300) made this pull request unmergeable. Please resolve the merge conflicts.
@nox nox force-pushed the derive-all-the-things branch 2 times, most recently from 0e639ac to 9f9e14e Aug 30, 2017
@nox
Copy link
Member Author

nox commented Aug 30, 2017

Had forgotten -moz-middle-with-baseline, will do a geckotry again when @emilio's PR removing HasViewportPercentage lands in autoland.
@bors-servo
Copy link
Contributor

bors-servo commented Aug 30, 2017

☔ The latest upstream changes (presumably #18234) made this pull request unmergeable. Please resolve the merge conflicts.
@nox
Use generics for the vertical-align property
Loading status checks…
542a933
@nox nox force-pushed the derive-all-the-things branch from 9f9e14e to 542a933 Aug 30, 2017
@nox
Copy link
Member Author

nox commented Aug 30, 2017

https://treeherder.mozilla.org/#/jobs?repo=try&revision=974bb2328403af3933340a8377116c86551f325a
@nox
Copy link
Member Author

nox commented Aug 31, 2017

Known intermittent in the geckotry.

@bors-servo r=emilio
@bors-servo
Copy link
Contributor

bors-servo commented Aug 31, 2017

📌 Commit 542a933 has been approved by emilio
@bors-servo
Copy link
Contributor

bors-servo commented Aug 31, 2017

⌛ Testing commit 542a933 with merge 174c37f...
bors-servo added a commit that referenced this pull request Aug 31, 2017
@bors-servo
Auto merge of #18301 - servo:derive-all-the-things, r=emilio
Loading status checks…
174c37f 
Use generics for the vertical-align property

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

bors-servo commented Aug 31, 2017

☀️ 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: emilio
Pushing 174c37f to master...
@bors-servo bors-servo mentioned this pull request Aug 31, 2017
Merged
3 of 3 tasks complete
@bors-servo bors-servo merged commit 542a933 into master Aug 31, 2017
4 checks passed
4 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
dependency-ci Dependencies checked
Details
homu Test successful
Details
@SimonSapin SimonSapin deleted the derive-all-the-things branch Sep 11, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emilio emilio

Assignees

@emilio emilio

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@nox @highfive @jdm @emilio @bors-servo @metajack
You can’t perform that action at this time.