Skip to content

/ servo

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 to latest rust-cssparser. #6835

Merged
merged 1 commit into from Jul 31, 2015
Merged

Update to latest rust-cssparser. #6835

merged 1 commit into from Jul 31, 2015
+129 −43

Conversation

@metajack
Copy link
Contributor

metajack commented Jul 29, 2015

Review on Reviewable
@metajack
Copy link
Contributor Author

metajack commented Jul 29, 2015

r? @pcwalton

This is to land your cssparser changes in Servo.
@Ms2ger
Copy link
Contributor

Ms2ger commented Jul 29, 2015

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Jul 29, 2015

📌 Commit bd52135 has been approved by Ms2ger
@bors-servo
Copy link
Contributor

bors-servo commented Jul 30, 2015

⌛ Testing commit bd52135 with merge ed4a259...
bors-servo pushed a commit that referenced this pull request Jul 30, 2015
bors-servo
Auto merge of #6835 - metajack:cssparserup, r=Ms2ger
ed4a259 
Update to latest rust-cssparser.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6835)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jul 30, 2015

💔 Test failed - mac1
@jdm
Copy link
Member

jdm commented Jul 30, 2015 



/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html
----------------------------------------------------------------------
FAIL Canvas test: 2d.fillStyle.parse.invalid.hex4
/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html
----------------------------------------------------------------------
FAIL Canvas test: 2d.fillStyle.parse.invalid.hex8
@jdm jdm added S-tests-failed and removed S-awaiting-merge labels Jul 30, 2015
@Ms2ger
Copy link
Contributor

Ms2ger commented Jul 30, 2015

Looks like the upstream tests need updating for the newly allowed syntax.
@metajack metajack force-pushed the metajack:cssparserup branch from f08be80 to 077d341 Jul 30, 2015
@metajack
Copy link
Contributor Author

metajack commented Jul 30, 2015

@Ms2ger Tests updated. r?

I'm not sure why --manifest-update added the deletions it did; I didn't touch anything about those tests.
@Ms2ger
Copy link
Contributor

Ms2ger commented Jul 30, 2015

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Jul 30, 2015

📌 Commit 077d341 has been approved by Ms2ger
@bors-servo
Copy link
Contributor

bors-servo commented Jul 30, 2015

⌛ Testing commit 077d341 with merge 0952eef...
bors-servo pushed a commit that referenced this pull request Jul 30, 2015
bors-servo
Auto merge of #6835 - metajack:cssparserup, r=Ms2ger
0952eef 
Update to latest rust-cssparser.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6835)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jul 30, 2015

💔 Test failed - mac3
@Ms2ger
Copy link
Contributor

Ms2ger commented Jul 30, 2015

Squash
@metajack metajack force-pushed the metajack:cssparserup branch from e4b450b to 82c8107 Jul 30, 2015
@metajack
Copy link
Contributor Author

metajack commented Jul 30, 2015

@bors-servo r=Ms2ger
@bors-servo
Copy link
Contributor

bors-servo commented Jul 30, 2015

📌 Commit 82c8107 has been approved by Ms2ger
@bors-servo
Copy link
Contributor

bors-servo commented Jul 30, 2015

🔒 Merge conflict
@bors-servo
Copy link
Contributor

bors-servo commented Jul 30, 2015

☔ The latest upstream changes (presumably #6740) made this pull request unmergeable. Please resolve the merge conflicts.
@metajack
Update to latest rust-cssparser.
Loading status checks…
154b5fd 
This also updates wpt tests for new CSS Level 4 color parsing, and
disables the relevant CSS tests until they can be updated (tracked
by #6856).
@metajack metajack force-pushed the metajack:cssparserup branch from 82c8107 to 154b5fd Jul 30, 2015
@metajack
Copy link
Contributor Author

metajack commented Jul 30, 2015

@bors-servo r=Ms2ger

Rebased.
@bors-servo
Copy link
Contributor

bors-servo commented Jul 30, 2015

📌 Commit 154b5fd has been approved by Ms2ger
@bors-servo
Copy link
Contributor

bors-servo commented Jul 30, 2015

⌛ Testing commit 154b5fd with merge e458dca...
bors-servo pushed a commit that referenced this pull request Jul 30, 2015
bors-servo
Auto merge of #6835 - metajack:cssparserup, r=Ms2ger
Loading status checks…
e458dca 
Update to latest rust-cssparser.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6835)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jul 31, 2015

☀️ Test successful - android, gonk, linux1, linux2, linux3, mac1, mac2, mac3
@bors-servo bors-servo merged commit 154b5fd into servo:master Jul 31, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Jul 31, 2015
Merged
@metajack metajack deleted the metajack:cssparserup branch Jul 31, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Ms2ger Ms2ger

Labels
S-awaiting-merge
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@metajack @Ms2ger @bors-servo @jdm @highfive
You can’t perform that action at this time.