Skip to content

Update cssparser #15766

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

Merged
merged 2 commits into from
Feb 28, 2017
Merged

Update cssparser #15766

merged 2 commits into from
Feb 28, 2017

Conversation

SimonSapin
Copy link
Member

@SimonSapin SimonSapin commented Feb 28, 2017

servo/rust-cssparser#123

In particular, match_ignore_ascii_case now supports the full match syntax.


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #__ (github issue number if applicable).
  • There are tests for these changes OR
  • These changes do not require tests because _____

This change is Reviewable

@highfive
Copy link

Heads up! This PR modifies the following files:

  • @bholley: components/style/Cargo.toml, components/style/lib.rs, components/style/properties/properties.mako.rs
  • @KiChjang: components/script/lib.rs, components/script/Cargo.toml
  • @fitzgen: components/script/lib.rs, components/script/Cargo.toml
  • @emilio: components/style/Cargo.toml, components/style/lib.rs, components/style/properties/properties.mako.rs

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Feb 28, 2017
@SimonSapin
Copy link
Member Author

Do not merge yet, I’ll remove the [replace] once this lands upstream, and figure out how to land it without breaking Firefox too much…

@SimonSapin
Copy link
Member Author

@bors-servo try

@bors-servo
Copy link
Contributor

⌛ Trying commit 1efa9b5 with merge 6359189...

bors-servo pushed a commit that referenced this pull request Feb 28, 2017
Update cssparser

<!-- Please describe your changes on the following line: -->

servo/rust-cssparser#123

In particular, `match_ignore_ascii_case` now supports the full `match` syntax.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/15766)
<!-- 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-css, mac-rel-wpt1, mac-rel-wpt2, windows-gnu-dev, windows-msvc-dev
State: approved= try=True

Cargo.toml Outdated
@@ -14,3 +14,6 @@ opt-level = 3
# Uncomment to profile on Linux:
# debug = true
# lto = false

[replace]
"cssparser:0.11.0" = {git = "https://github.com/servo/rust-cssparser", rev = "lol-replace"}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lol please don't replace? 😄

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this was only to be able to run on try before servo/rust-cssparser#123 landed, which conversely I didn’t land before making sure the Servo PR was ready, in order to avoid a deadlock where further cssparser changes would be blocked.

Copy link
Member

@Manishearth Manishearth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r+ with the replace removed

@SimonSapin
Copy link
Member Author

@bors-servo r=Manishearth

@bors-servo
Copy link
Contributor

📌 Commit 288ef97 has been approved by Manishearth

@highfive highfive assigned Manishearth and unassigned nox Feb 28, 2017
@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 28, 2017
@bors-servo
Copy link
Contributor

⌛ Testing commit 288ef97 with merge fbfcfc2...

bors-servo pushed a commit that referenced this pull request Feb 28, 2017
Update cssparser

<!-- Please describe your changes on the following line: -->

servo/rust-cssparser#123

In particular, `match_ignore_ascii_case` now supports the full `match` syntax.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/15766)
<!-- 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-css, mac-rel-wpt1, mac-rel-wpt2, windows-gnu-dev, windows-msvc-dev
Approved by: Manishearth
Pushing fbfcfc2 to master...

@bors-servo bors-servo merged commit 288ef97 into master Feb 28, 2017
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Feb 28, 2017
@SimonSapin SimonSapin deleted the cssparserup branch February 28, 2017 17:13
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.

5 participants