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

style: Simplify "prohibit display: contents" adjustment. #19662

Merged
merged 2 commits into from Dec 31, 2017
Merged

style: Simplify "prohibit display: contents" adjustment. #19662

merged 2 commits into from Dec 31, 2017

Conversation

@emilio
Copy link
Member

emilio commented Dec 30, 2017 •
edited by SimonSapin

On top of #19661.

The NAC condition is pointless because NAC don't match author rules unless they
are a pseudo-element too.

This change is Reviewable
@highfive
Copy link

highfive commented Dec 30, 2017

Heads up! This PR modifies the following files:

  • @bholley: ports/geckolib/glue.rs, components/style/style_adjuster.rs, components/style/properties/properties.mako.rs, components/style/style_resolver.rs
  • @canaltinova: components/style/style_adjuster.rs, components/style/properties/properties.mako.rs, components/style/style_resolver.rs
@highfive
Copy link

highfive commented Dec 30, 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 Dec 30, 2017

r? @upsuper
@highfive highfive assigned upsuper and unassigned Manishearth Dec 30, 2017
@upsuper
Copy link
Member

upsuper commented Dec 30, 2017

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Dec 30, 2017

📌 Commit 20185d2 has been approved by upsuper
@emilio
Copy link
Member Author

emilio commented Dec 30, 2017

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

bors-servo commented Dec 30, 2017

📌 Commit 6826b02 has been approved by upsuper
@bors-servo
Copy link
Contributor

bors-servo commented Dec 31, 2017

⌛ Testing commit 6826b02 with merge 8ac825d...
bors-servo added a commit that referenced this pull request Dec 31, 2017
@bors-servo
Auto merge of #19662 - emilio:simplify-prohibit-display-contents, r=u…
Loading status checks…
8ac825d 
…psuper

style: Simplify "prohibit display: contents" adjustment.

On top of #19661.

The NAC condition is pointless because NAC don't match author rules unless they
are a pseudo-element too.

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

bors-servo commented Dec 31, 2017

💔 Test failed - linux-dev
emilio added 2 commits Dec 30, 2017
@emilio
style: Simplify "prohibit display: contents" adjustment.
Unverified
This user has not uploaded their public key yet.
GPG key ID: 056B727BB9C1027C Learn about signing commits
a747de1 
On top of #19661.

The NAC condition is pointless because NAC don't match author rules unless they
are a pseudo-element too.
@emilio
style: Renumber CascadeFlags bits.
Unverified
This user has not uploaded their public key yet.
GPG key ID: 056B727BB9C1027C Learn about signing commits
Loading status checks…
bc2ef51
@emilio emilio force-pushed the emilio:simplify-prohibit-display-contents branch from 6826b02 to bc2ef51 Dec 31, 2017
@emilio
Copy link
Member Author

emilio commented Dec 31, 2017

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

bors-servo commented Dec 31, 2017

📌 Commit bc2ef51 has been approved by upsuper
@bors-servo
Copy link
Contributor

bors-servo commented Dec 31, 2017

⌛ Testing commit bc2ef51 with merge ebff37b...
bors-servo added a commit that referenced this pull request Dec 31, 2017
@bors-servo
Auto merge of #19662 - emilio:simplify-prohibit-display-contents, r=u…
Loading status checks…
ebff37b 
…psuper

style: Simplify "prohibit display: contents" adjustment.

On top of #19661.

The NAC condition is pointless because NAC don't match author rules unless they
are a pseudo-element too.

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

bors-servo commented Dec 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: upsuper
Pushing ebff37b to master...
@bors-servo bors-servo merged commit bc2ef51 into servo:master Dec 31, 2017
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Dec 31, 2017
Closed
@emilio emilio deleted the emilio:simplify-prohibit-display-contents branch Dec 31, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@upsuper upsuper

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@emilio @highfive @upsuper @bors-servo @Manishearth
You can’t perform that action at this time.