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 to 0.9 #15552

Merged
merged 1 commit into from Feb 15, 2017
Merged

Update cssparser to 0.9 #15552

merged 1 commit into from Feb 15, 2017

Conversation

@SimonSapin
Copy link
Member

SimonSapin commented Feb 14, 2017


  • ./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

highfive commented Feb 14, 2017

Heads up! This PR modifies the following files:

  • @bholley: components/style/parser.rs, components/style/stylesheets.rs, components/style/font_face.rs
  • @emilio: components/style/parser.rs, components/style/stylesheets.rs, components/style/font_face.rs
@SimonSapin
Copy link
Member Author

SimonSapin commented Feb 14, 2017

@highfive
Copy link

highfive commented Feb 14, 2017

warning Warning warning

  • These commits modify style code, but no tests are modified. Please consider adding a test!
@bors-servo
Copy link
Contributor

bors-servo commented Feb 14, 2017

Trying commit 42f9324 with merge bb84e63...

bors-servo added a commit that referenced this pull request Feb 14, 2017
Do not merge yet: Update cssparser to 0.9

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

Do not merge yet.

---
<!-- 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
- [ ] `./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. -->
@bors-servo
Copy link
Contributor

bors-servo commented Feb 14, 2017

💔 Test failed - linux-dev

@SimonSapin
Copy link
Member Author

SimonSapin commented Feb 14, 2017

Tidy fails because of [replace]: #15555

@SimonSapin SimonSapin force-pushed the cssparserup branch from 42f9324 to 4f74434 Feb 14, 2017
@SimonSapin SimonSapin changed the title Do not merge yet: Update cssparser to 0.9 Update cssparser to 0.9 Feb 14, 2017
@SimonSapin
Copy link
Member Author

SimonSapin commented Feb 14, 2017

This is now ready to land. r? @Manishearth

@highfive highfive assigned Manishearth and unassigned jdm Feb 14, 2017
@nox
nox approved these changes Feb 15, 2017
Copy link
Member

nox left a comment

r=me with that one super nit.

@@ -14,7 +14,7 @@ doctest = false
[dependencies]
app_units = "0.3"
atomic_refcell = "0.1"
cssparser = {version = "0.8"}
cssparser = {version = "0.9"}

This comment has been minimized.

@nox

nox Feb 15, 2017

Member

Super-nit: "0.9" instead of a dict.

This comment has been minimized.

@SimonSapin

SimonSapin Feb 15, 2017

Author Member

Done.

@SimonSapin SimonSapin force-pushed the cssparserup branch from 4f74434 to 20a20d8 Feb 15, 2017
@SimonSapin
Copy link
Member Author

SimonSapin commented Feb 15, 2017

@bors-servo r=nox

@bors-servo
Copy link
Contributor

bors-servo commented Feb 15, 2017

📌 Commit 20a20d8 has been approved by nox

@highfive highfive assigned nox and unassigned Manishearth Feb 15, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Feb 15, 2017

🔒 Merge conflict

@bors-servo
Copy link
Contributor

bors-servo commented Feb 15, 2017

The latest upstream changes (presumably #15545) made this pull request unmergeable. Please resolve the merge conflicts.

@SimonSapin SimonSapin force-pushed the cssparserup branch from 20a20d8 to c3cad2d Feb 15, 2017
@SimonSapin
Copy link
Member Author

SimonSapin commented Feb 15, 2017

@bors-servo r=nox

@bors-servo
Copy link
Contributor

bors-servo commented Feb 15, 2017

📌 Commit c3cad2d has been approved by nox

@bors-servo
Copy link
Contributor

bors-servo commented Feb 15, 2017

Testing commit c3cad2d with merge 216a89f...

bors-servo added a commit that referenced this pull request Feb 15, 2017
Update cssparser to 0.9

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

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

bors-servo commented Feb 15, 2017

@bors-servo bors-servo merged commit c3cad2d into master Feb 15, 2017
4 checks passed
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 16, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
You can’t perform that action at this time.