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

Update cssparser #15766

Merged
merged 2 commits into from Feb 28, 2017

Conversation

Projects
None yet
5 participants
@SimonSapin
Copy link
Member

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

This comment has been minimized.

Copy link

commented Feb 28, 2017

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
@SimonSapin

This comment has been minimized.

Copy link
Member Author

commented Feb 28, 2017

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

This comment has been minimized.

Copy link
Member Author

commented Feb 28, 2017

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Feb 28, 2017

⌛️ Trying commit 1efa9b5 with merge 6359189...

bors-servo added a commit that referenced this pull request Feb 28, 2017

Auto merge of #15766 - servo:cssparserup, r=<try>
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

This comment has been minimized.

Copy link
Contributor

commented Feb 28, 2017

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"}

This comment has been minimized.

Copy link
@Manishearth

Manishearth Feb 28, 2017

Member

lol please don't replace? 😄

This comment has been minimized.

Copy link
@SimonSapin

SimonSapin Feb 28, 2017

Author Member

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.

@Manishearth
Copy link
Member

left a comment

r+ with the replace removed

@SimonSapin SimonSapin force-pushed the cssparserup branch from 1efa9b5 to 288ef97 Feb 28, 2017

@SimonSapin

This comment has been minimized.

Copy link
Member Author

commented Feb 28, 2017

@bors-servo r=Manishearth

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Feb 28, 2017

📌 Commit 288ef97 has been approved by Manishearth

@highfive highfive assigned Manishearth and unassigned nox Feb 28, 2017

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Feb 28, 2017

⌛️ Testing commit 288ef97 with merge fbfcfc2...

bors-servo added a commit that referenced this pull request Feb 28, 2017

Auto merge of #15766 - servo:cssparserup, r=Manishearth
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

This comment has been minimized.

Copy link
Contributor

commented Feb 28, 2017

☀️ 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

4 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
dependency-ci Dependencies checked
Details
homu Test successful
Details

@SimonSapin SimonSapin deleted the cssparserup branch Feb 28, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.