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: Avoid branching on the origin for each selector when inserting in the cascade data. #17991

Merged
merged 1 commit into from Aug 7, 2017

Conversation

emilio
Copy link
Member

@emilio emilio commented Aug 7, 2017

This is on top of #17990, and it's intended to help with bug 1386045.


This change is Reviewable

@highfive
Copy link

highfive commented Aug 7, 2017

Heads up! This PR modifies the following files:

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Aug 7, 2017
@highfive
Copy link

highfive commented Aug 7, 2017

warning Warning warning

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

@emilio
Copy link
Member Author

emilio commented Aug 7, 2017

r? @heycam

@highfive highfive assigned heycam and unassigned mbrubeck Aug 7, 2017
@heycam
Copy link
Contributor

heycam commented Aug 7, 2017

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 07d5a31 has been approved by heycam

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

🔒 Merge conflict

@bors-servo
Copy link
Contributor

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

@highfive highfive added S-needs-rebase There are merge conflict errors. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Aug 7, 2017
… in the cascade data.

This is on top of servo#17990, and it's intended to help with bug 1386045.
@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Aug 7, 2017
@emilio
Copy link
Member Author

emilio commented Aug 7, 2017

@bors-servo r=heycam p=10

@bors-servo
Copy link
Contributor

📌 Commit 7ee4b3f has been approved by heycam

@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. S-needs-rebase There are merge conflict errors. labels Aug 7, 2017
@bors-servo
Copy link
Contributor

⌛ Testing commit 7ee4b3f with merge 806540c...

bors-servo pushed a commit that referenced this pull request Aug 7, 2017
style: Avoid branching on the origin for each selector when inserting in the cascade data.

This is on top of #17990, and it's intended to help with bug 1386045.

<!-- 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/17991)
<!-- 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: heycam
Pushing 806540c to master...

@bors-servo bors-servo merged commit 7ee4b3f into servo:master Aug 7, 2017
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Aug 7, 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