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

Upgrade cssparser to 0.15 #17345

Merged
merged 1 commit into from Jun 16, 2017
Merged

Upgrade cssparser to 0.15 #17345

merged 1 commit into from Jun 16, 2017

Conversation

@SimonSapin
Copy link
Member

SimonSapin commented Jun 15, 2017 •
edited

Depends on servo/rust-cssparser#159

This change is Reviewable
@SimonSapin
Copy link
Member Author

SimonSapin commented Jun 15, 2017

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Jun 15, 2017

⌛ Trying commit c056305 with merge 7129e4e...
bors-servo added a commit that referenced this pull request Jun 15, 2017
@bors-servo
Auto merge of #17345 - servo:cssparserup, r=<try>
Loading status checks…
7129e4e 
Upgrade cssparser to 0.15

Depends on servo/rust-cssparser#159
@highfive
Copy link

highfive commented Jun 15, 2017

Heads up! This PR modifies the following files:

  • @bholley: components/style/stylesheets/viewport_rule.rs, components/style/servo/selector_parser.rs, components/style/values/specified/calc.rs, components/style/stylesheets/rule_parser.rs, components/style/values/specified/length.rs and 18 more
  • @KiChjang: components/script/dom/bindings/str.rs
  • @fitzgen: components/script/dom/bindings/str.rs
  • @emilio: components/style/stylesheets/viewport_rule.rs, components/style/servo/selector_parser.rs, components/style/values/specified/calc.rs, components/style/stylesheets/rule_parser.rs, components/style/values/specified/length.rs and 19 more
@bors-servo
Copy link
Contributor

bors-servo commented Jun 15, 2017

💔 Test failed - linux-dev
@SimonSapin SimonSapin force-pushed the cssparserup branch from c056305 to e6fc497 Jun 15, 2017
@SimonSapin
Copy link
Member Author

SimonSapin commented Jun 15, 2017

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Jun 15, 2017

⌛ Trying commit e6fc497 with merge 922a2b8...
bors-servo added a commit that referenced this pull request Jun 15, 2017
@bors-servo
Auto merge of #17345 - servo:cssparserup, r=<try>
Loading status checks…
922a2b8 
Upgrade cssparser to 0.15

Depends on servo/rust-cssparser#159

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

bors-servo commented Jun 15, 2017

💔 Test failed - linux-rel-wpt
@mbrubeck
Copy link
Contributor

mbrubeck commented Jun 16, 2017

linux-rel-css, mac-rel-wpt1, and mac-rel-wpt3 also had unexpected results.
@SimonSapin SimonSapin mentioned this pull request Jun 16, 2017
Merged
@emilio
emilio reviewed Jun 16, 2017
View changes
ports/geckolib/glue.rs
@@ -2351,7 +2352,8 @@ pub extern "C" fn Servo_DeclarationBlock_SetFontFamily(declarations:
let string = unsafe { (*value).to_string() };
let mut input = ParserInput::new(&string);
let mut parser = Parser::new(&mut input);
if let Ok(family) = FontFamily::parse(&mut parser) {
let result = FontFamily::parse(&mut parser);

This comment has been minimized.

Sign in to view
@emilio

emilio Jun 16, 2017

Member

Why is this change needed?

This comment has been minimized.

Sign in to view
@SimonSapin

SimonSapin Jun 16, 2017

Author Member

something something borrow checker something temporaries created in the last statement of a block live as long as the block something. No idea why that didn’t occur before, though.
@SimonSapin SimonSapin force-pushed the cssparserup branch from e6fc497 to 378cba0 Jun 16, 2017
@SimonSapin
Copy link
Member Author

SimonSapin commented Jun 16, 2017

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Jun 16, 2017

⌛ Trying commit 378cba0 with merge ce2017e...
bors-servo added a commit that referenced this pull request Jun 16, 2017
@bors-servo
Auto merge of #17345 - servo:cssparserup, r=<try>
Loading status checks…
ce2017e 
Upgrade cssparser to 0.15

Depends on servo/rust-cssparser#159

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

bors-servo commented Jun 16, 2017

💔 Test failed - linux-dev
@SimonSapin SimonSapin force-pushed the cssparserup branch from 378cba0 to 920f1d1 Jun 16, 2017
@SimonSapin
Copy link
Member Author

SimonSapin commented Jun 16, 2017

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Jun 16, 2017

⌛ Trying commit 920f1d1 with merge d54fb12...
bors-servo added a commit that referenced this pull request Jun 16, 2017
@bors-servo
Auto merge of #17345 - servo:cssparserup, r=<try>
Loading status checks…
d54fb12 
Upgrade cssparser to 0.15

Depends on servo/rust-cssparser#159

<!-- 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/17345)
<!-- Reviewable:end -->
@SimonSapin
Copy link
Member Author

SimonSapin commented Jun 16, 2017

Homu somehow didn’t get the memo, but this try run is all green on http://build.servo.org/grid.
@SimonSapin
Copy link
Member Author

SimonSapin commented Jun 16, 2017

Waiting on #17355 because serde-1.0-in-cssparser landed before token-shrink did.
@bors-servo
Copy link
Contributor

bors-servo commented Jun 16, 2017

☔ The latest upstream changes (presumably #17355) made this pull request unmergeable. Please resolve the merge conflicts.
@SimonSapin
Upgrade cssparser to 0.15
Loading status checks…
b83afde
@SimonSapin SimonSapin force-pushed the cssparserup branch from 920f1d1 to b83afde Jun 16, 2017
@SimonSapin
Copy link
Member Author

SimonSapin commented Jun 16, 2017

@bors-servo try

https://treeherder.mozilla.org/#/jobs?repo=try&revision=b5b4bdddbb5bd6b5b46d41ee99a7c913bb7acad4
@bors-servo
Copy link
Contributor

bors-servo commented Jun 16, 2017

⌛ Trying commit b83afde with merge 75876a0...
bors-servo added a commit that referenced this pull request Jun 16, 2017
@bors-servo
Auto merge of #17345 - servo:cssparserup, r=<try>
Loading status checks…
75876a0 
Upgrade cssparser to 0.15

Depends on servo/rust-cssparser#159

<!-- 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/17345)
<!-- Reviewable:end -->
@nox
Copy link
Member

nox commented Jun 16, 2017

Nice!

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

bors-servo commented Jun 16, 2017

📌 Commit b83afde has been approved by nox
@highfive highfive assigned nox and unassigned KiChjang Jun 16, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Jun 16, 2017

⚡ Previous build results for android, arm32, arm64, linux-rel-wpt, mac-dev-unit, mac-rel-wpt1, mac-rel-wpt4, windows-msvc-dev are reusable. Rebuilding only linux-dev, linux-rel-css, mac-rel-css1, mac-rel-css2, mac-rel-wpt2, mac-rel-wpt3...
@bors-servo
Copy link
Contributor

bors-servo commented Jun 16, 2017

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: nox
Pushing 75876a0 to master...
@bors-servo bors-servo merged commit b83afde into master Jun 16, 2017
3 of 4 checks passed
3 of 4 checks passed
dependency-ci Failed dependency checks
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@SimonSapin SimonSapin deleted the cssparserup branch Jun 16, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emilio emilio

Assignees

@nox nox

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
@SimonSapin @bors-servo @highfive @mbrubeck @nox @emilio @KiChjang
You can’t perform that action at this time.