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: Move most of allowed_in to NonCustomPropertyId. #20046

Merged
merged 1 commit into from
Feb 14, 2018

Conversation

emilio
Copy link
Member

@emilio emilio commented Feb 14, 2018

Also simplify the servo property id to gecko property id conversion to be faster
and less repetitive.

This is in preparation of some patches to properly allow disabled longhands on enabled shorthands, something that we don't contemplate right now.


This change is Reviewable

@highfive
Copy link

Heads up! This PR modifies the following files:

  • @bholley: components/style/properties/properties.mako.rs
  • @canaltinova: components/style/properties/properties.mako.rs

@highfive
Copy link

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
  • 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 Feb 14, 2018
@emilio
Copy link
Member Author

emilio commented Feb 14, 2018

r? @nox

@highfive highfive assigned nox and unassigned KiChjang Feb 14, 2018
@nox
Copy link
Contributor

nox commented Feb 14, 2018

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit c53016a 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 Feb 14, 2018
@bors-servo
Copy link
Contributor

⌛ Testing commit c53016a with merge 8338e41...

bors-servo pushed a commit that referenced this pull request Feb 14, 2018
style: Move most of allowed_in to NonCustomPropertyId.

Also simplify the servo property id to gecko property id conversion to be faster
and less repetitive.

This is in preparation of some patches to properly allow disabled longhands on enabled shorthands, something that we don't contemplate right now.

<!-- 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/20046)
<!-- 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 Feb 14, 2018
@CYBAI
Copy link
Member

CYBAI commented Feb 14, 2018

error[E0425]: cannot find value `id` in this scope
     --> /home/servo/buildbot/slave/linux-rel-wpt/build/target/release/build/style-4b63d270e8e82720/out/properties.rs:51080:44
      |
51080 |                 let pref = match PREF_NAME[id.0] {
      |                                            ^^ not found in this scope
help: possible candidate is found in another module, you can import it into scope
      |
14    | use std::process::id;
      |

error: aborting due to previous error

error: Could not compile `style`.

Also simplify the servo property id to gecko property id conversion to be faster
and less repetitive.
@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 Feb 14, 2018
@emilio
Copy link
Member Author

emilio commented Feb 14, 2018

@bors-servo r=nox

@bors-servo
Copy link
Contributor

📌 Commit 1548520 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 Feb 14, 2018
@bors-servo
Copy link
Contributor

⌛ Testing commit 1548520 with merge bdbb298...

bors-servo pushed a commit that referenced this pull request Feb 14, 2018
style: Move most of allowed_in to NonCustomPropertyId.

Also simplify the servo property id to gecko property id conversion to be faster
and less repetitive.

This is in preparation of some patches to properly allow disabled longhands on enabled shorthands, something that we don't contemplate right now.

<!-- 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/20046)
<!-- 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 bdbb298 to master...

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

6 participants