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.

Sign up for GitHub

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

Jump to bottom

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 SimonSapin commented Jun 15, 2017 •
edited
Loading

Depends on servo/rust-cssparser#159

This change is Reviewable

@SimonSapin
Copy link
Member Author

@bors-servo try

@bors-servo
Copy link
Contributor

⌛ Trying commit c056305 with merge 7129e4e...

bors-servo pushed a commit that referenced this pull request Jun 15, 2017
Auto merge of #17345 - servo:cssparserup, r=<try>
7129e4e 
Upgrade cssparser to 0.15

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

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

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jun 15, 2017
@bors-servo
Copy link
Contributor

💔 Test failed - linux-dev

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Jun 15, 2017
@highfive highfive removed the S-tests-failed The changes caused existing tests to fail. label Jun 15, 2017
@SimonSapin
Copy link
Member Author

@bors-servo try

@bors-servo
Copy link
Contributor

⌛ Trying commit e6fc497 with merge 922a2b8...

bors-servo pushed a commit that referenced this pull request Jun 15, 2017
Auto merge of #17345 - servo:cssparserup, r=<try>
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

💔 Test failed - linux-rel-wpt

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Jun 15, 2017
@mbrubeck
Copy link
Contributor

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 reviewed 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);
Copy link
Member

Choose a reason for hiding this comment

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

Why is this change needed?

Copy link
Member Author

Choose a reason for hiding this comment

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

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.

@highfive highfive removed the S-tests-failed The changes caused existing tests to fail. label Jun 16, 2017
@SimonSapin
Copy link
Member Author

@bors-servo try

@bors-servo
Copy link
Contributor

⌛ Trying commit 378cba0 with merge ce2017e...

bors-servo pushed a commit that referenced this pull request Jun 16, 2017
Auto merge of #17345 - servo:cssparserup, r=<try>
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

💔 Test failed - linux-dev

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Jun 16, 2017
@highfive highfive removed the S-tests-failed The changes caused existing tests to fail. label Jun 16, 2017
@SimonSapin
Copy link
Member Author

@bors-servo try

@bors-servo
Copy link
Contributor

⌛ Trying commit 920f1d1 with merge d54fb12...

bors-servo pushed a commit that referenced this pull request Jun 16, 2017
Auto merge of #17345 - servo:cssparserup, r=<try>
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

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

Waiting on #17355 because serde-1.0-in-cssparser landed before token-shrink did.

@bors-servo
Copy link
Contributor

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

@highfive highfive added the S-needs-rebase There are merge conflict errors. label Jun 16, 2017
@SimonSapin
Copy link
Member Author

@bors-servo try

https://treeherder.mozilla.org/#/jobs?repo=try&revision=b5b4bdddbb5bd6b5b46d41ee99a7c913bb7acad4

@bors-servo
Copy link
Contributor

⌛ Trying commit b83afde with merge 75876a0...

bors-servo pushed a commit that referenced this pull request Jun 16, 2017
Auto merge of #17345 - servo:cssparserup, r=<try>
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
Contributor

nox commented Jun 16, 2017

Nice!

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit b83afde has been approved by nox

@highfive highfive assigned nox and unassigned KiChjang Jun 16, 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. S-needs-rebase There are merge conflict errors. labels Jun 16, 2017
@bors-servo
Copy link
Contributor

⚡ 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

☀️ 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
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Jun 16, 2017
@SimonSapin SimonSapin deleted the cssparserup branch June 16, 2017 14:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emilio emilio emilio left review comments

Assignees

@nox nox

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@SimonSapin @bors-servo @highfive @mbrubeck @nox @emilio @KiChjang