Have at-rule without block handled in two stages as well #180
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @SimonSapin |
|
Probably we shouldn't take this until we can figure out a solution for servo/servo#18139 (comment). |
|
Since that has been solved, I think this is ready for review as well now. This is a breaking change. I have a local patch for Servo side. |
|
Maybe it is still better to distinguish between type for |
|
I added |
|
OK, I'll try to figure out it tomorrow. |
upsuper
force-pushed
the
at-rule-parser
branch
from
76bf7c4 to
fd02324
Compare
|
We probably should upgrade Servo to use 0.19.3 and then merge this PR and handle the change in a separate Servo PR. |
|
servo/servo#18171 upgrades to 0.19.3 but we’re waiting on dtolnay/dtoa#9 to land it, unless you’re ok with including the unnecessary PNG in mozilla-central. |
|
☔ The latest upstream changes (presumably 9542ab4) made this pull request unmergeable. Please resolve the merge conflicts. |
upsuper
force-pushed
the
at-rule-parser
branch
2 times, most recently
from
a13d07b to
e365c23
Compare
|
@SimonSapin ping for review? |
|
Looks good. Do tests pass at the intermediate commit? Please squash if not. Do you have a corresponding Servo PR? r=me when that’s ready. Reviewed 5 of 5 files at r1, 3 of 3 files at r2. Comments from Reviewable |
|
It is supposed to pass at the intermediate commit. I'll try again before merging. |
|
So I can confirm that tests pass at the intermediate commit. |
upsuper
force-pushed
the
at-rule-parser
branch
from
e365c23 to
08d510d
Compare
bors-servo
pushed a commit
to servo/servo
that referenced
this pull request
Sep 1, 2017
[WIP] Parse at-rule without block in two stages This is the Servo side change necessary for servo/rust-cssparser#180. Cargo.lock inside needs to be updated before landing after new version of cssparser gets published. <!-- 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/18336) <!-- Reviewable:end -->
bors-servo
pushed a commit
to servo/servo
that referenced
this pull request
Sep 1, 2017
[WIP] Parse at-rule without block in two stages This is the Servo side change necessary for servo/rust-cssparser#180. Cargo.lock inside needs to be updated before landing after new version of cssparser gets published. <!-- 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/18336) <!-- Reviewable:end -->
|
@bors-servo r+ Reviewed 2 of 2 files at r4. Comments from Reviewable |
|
📌 Commit 08d510d has been approved by |
bors-servo
pushed a commit
that referenced
this pull request
Sep 1, 2017
Have at-rule without block handled in two stages as well This change makes `AtRuleParser::parse_prelude` always return a prelude if parsed successfully, so that at-rules which do not accept block can be handled in two phases just like those with block. This is important because at-rules without block usually have side effects. If `parse_prelude` executes the side effect, but `parse_at_rule` later determined that the rule is actually invalid (e.g. because it is followed by a block), there is no way for impl of `AtRuleParser` to undo the side effect. It provides the necessary parser side change for fixing [Gecko bug 1388911](https://bugzilla.mozilla.org/show_bug.cgi?id=1388911). <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-cssparser/180) <!-- Reviewable:end -->
|
☀️ Test successful - status-travis |
bors-servo
pushed a commit
to servo/servo
that referenced
this pull request
Sep 1, 2017
Parse at-rule without block in two stages This is the Servo side change necessary for servo/rust-cssparser#180. ---- This also pulls in other changes from cssparser 0.20.0. <!-- 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/18336) <!-- Reviewable:end -->
bors-servo
pushed a commit
to servo/servo
that referenced
this pull request
Sep 1, 2017
Parse at-rule without block in two stages This is the Servo side change necessary for servo/rust-cssparser#180. ---- This also pulls in other changes from cssparser 0.20.0. <!-- 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/18336) <!-- Reviewable:end -->
bors-servo
pushed a commit
to servo/servo
that referenced
this pull request
Sep 1, 2017
Parse at-rule without block in two stages This is the Servo side change necessary for servo/rust-cssparser#180. ---- This also pulls in other changes from cssparser 0.20.0. <!-- 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/18336) <!-- Reviewable:end -->
bors-servo
pushed a commit
to servo/servo
that referenced
this pull request
Sep 1, 2017
Parse at-rule without block in two stages This is the Servo side change necessary for servo/rust-cssparser#180. ---- This also pulls in other changes from cssparser 0.20.0. <!-- 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/18336) <!-- Reviewable:end -->
bors-servo
pushed a commit
to servo/servo
that referenced
this pull request
Sep 1, 2017
Parse at-rule without block in two stages This is the Servo side change necessary for servo/rust-cssparser#180. ---- This also pulls in other changes from cssparser 0.20.0. <!-- 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/18336) <!-- Reviewable:end -->
xeonchen
pushed a commit
to xeonchen/gecko-cinnabar
that referenced
this pull request
Sep 2, 2017
… upsuper:two-stage-at-rule); r=SimonSapin This is the Servo side change necessary for servo/rust-cssparser#180. ---- This also pulls in other changes from cssparser 0.20.0. Source-Repo: https://github.com/servo/servo Source-Revision: f2e5b4992658db504db0f6176d3bfa580ced6fd0
moz-v2v-gh
pushed a commit
to mozilla/gecko-dev
that referenced
this pull request
Sep 2, 2017
… upsuper:two-stage-at-rule); r=SimonSapin This is the Servo side change necessary for servo/rust-cssparser#180. ---- This also pulls in other changes from cssparser 0.20.0. Source-Repo: https://github.com/servo/servo Source-Revision: f2e5b4992658db504db0f6176d3bfa580ced6fd0 --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : 9c1767c636a6585ed1d552ae8c26376547d2f2fc
aethanyc
pushed a commit
to aethanyc/gecko-dev
that referenced
this pull request
Sep 3, 2017
… upsuper:two-stage-at-rule); r=SimonSapin This is the Servo side change necessary for servo/rust-cssparser#180. ---- This also pulls in other changes from cssparser 0.20.0. Source-Repo: https://github.com/servo/servo Source-Revision: f2e5b4992658db504db0f6176d3bfa580ced6fd0
gecko-dev-updater
pushed a commit
to marco-c/gecko-dev-wordified-and-comments-removed
that referenced
this pull request
Oct 1, 2019
… upsuper:two-stage-at-rule); r=SimonSapin This is the Servo side change necessary for servo/rust-cssparser#180. ---- This also pulls in other changes from cssparser 0.20.0. Source-Repo: https://github.com/servo/servo Source-Revision: f2e5b4992658db504db0f6176d3bfa580ced6fd0 UltraBlame original commit: 18d453c2736cc29e3e52acdd3c262292db07b4d3
gecko-dev-updater
pushed a commit
to marco-c/gecko-dev-comments-removed
that referenced
this pull request
Oct 1, 2019
… upsuper:two-stage-at-rule); r=SimonSapin This is the Servo side change necessary for servo/rust-cssparser#180. ---- This also pulls in other changes from cssparser 0.20.0. Source-Repo: https://github.com/servo/servo Source-Revision: f2e5b4992658db504db0f6176d3bfa580ced6fd0 UltraBlame original commit: 18d453c2736cc29e3e52acdd3c262292db07b4d3
gecko-dev-updater
pushed a commit
to marco-c/gecko-dev-wordified
that referenced
this pull request
Oct 1, 2019
… upsuper:two-stage-at-rule); r=SimonSapin This is the Servo side change necessary for servo/rust-cssparser#180. ---- This also pulls in other changes from cssparser 0.20.0. Source-Repo: https://github.com/servo/servo Source-Revision: f2e5b4992658db504db0f6176d3bfa580ced6fd0 UltraBlame original commit: 18d453c2736cc29e3e52acdd3c262292db07b4d3
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change makes
AtRuleParser::parse_preludealways return a prelude if parsed successfully, so that at-rules which do not accept block can be handled in two phases just like those with block.This is important because at-rules without block usually have side effects. If
parse_preludeexecutes the side effect, butparse_at_rulelater determined that the rule is actually invalid (e.g. because it is followed by a block), there is no way for impl ofAtRuleParserto undo the side effect.It provides the necessary parser side change for fixing Gecko bug 1388911.
This change is