Update cssparser to 0.18 #17820

SimonSapin · 2017-07-21T16:36:04Z

~~Do not merge yet, depends on servo/rust-cssparser#171.~~

This change is

highfive · 2017-07-21T16:36:08Z

Heads up! This PR modifies the following files:

@bholley: components/style/stylesheets/viewport_rule.rs, components/style/properties/longhand/position.mako.rs, components/style/values/specified/color.rs, components/style/properties/longhand/background.mako.rs, components/style/properties/longhand/text.mako.rs and 40 more
@canaltinova: components/style/stylesheets/viewport_rule.rs, components/style/properties/longhand/position.mako.rs, components/style/values/specified/color.rs, components/style/properties/longhand/background.mako.rs, components/style/properties/longhand/text.mako.rs and 40 more
@KiChjang: components/script/dom/csskeyframesrule.rs, components/script/dom/bindings/str.rs
@fitzgen: components/script/dom/csskeyframesrule.rs, components/script/dom/bindings/str.rs
@emilio: components/style/stylesheets/viewport_rule.rs, components/style/properties/longhand/position.mako.rs, components/style/values/specified/color.rs, components/style/properties/longhand/background.mako.rs, components/style/properties/longhand/text.mako.rs and 41 more

highfive · 2017-07-21T16:36:10Z

Warning

These commits modify unsafe code. Please review it carefully!
These commits modify style and script code, but no tests are modified. Please consider adding a test!

SimonSapin · 2017-07-21T16:36:14Z

@bors-servo try

bors-servo · 2017-07-21T16:36:18Z

⌛ Trying commit 3a5c6b0 with merge c3738e8...


        Auto merge of #17820 - servo:token-cache, r=<try>

Update cssparser to 0.18 Do not merge yet, depends on servo/rust-cssparser#171.

bors-servo · 2017-07-21T17:08:13Z

💔 Test failed - linux-rel-wpt

bors-servo · 2017-07-21T17:29:58Z

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

SimonSapin · 2017-07-21T18:07:53Z

@bors-servo try

bors-servo · 2017-07-21T18:07:57Z

⌛ Trying commit 17b8577 with merge 528c8cc...


        Auto merge of #17820 - servo:token-cache, r=<try>

Update cssparser to 0.18 Do not merge yet, depends on servo/rust-cssparser#171.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17820)

bors-servo · 2017-07-21T19:38:53Z

☀️ 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
State: approved= try=True

emilio

Looks good... I don't love the fact that the code looks uglier in many places, but... r=me

emilio · 2017-07-23T20:23:42Z

components/selectors/parser.rs

@@ -1231,16 +1232,17 @@ fn parse_qualified_name<'i, 't, P, E, Impl>
        },
        Ok(Token::Delim('*')) => {
            let position = input.position();
-            match input.next_including_whitespace() {
+            // FIXME: remove clone() when lifetimes are non-lexical
+            match input.next_including_whitespace().map(|t| t.clone()) {


nit: cloned().

cloned exists on Option but not on Result, unfortunately :(

emilio · 2017-07-23T20:23:42Z

components/selectors/parser.rs

                Ok(Token::Delim('|')) => {
                    explicit_namespace(input, QNamePrefix::ExplicitAnyNamespace)
                }
                result => {
                    input.reset(position);
                    if in_attr_selector {
                        match result {
-                            Ok(t) => Err(ParseError::Basic(BasicParseError::UnexpectedToken(t))),
-                             Err(e) => Err(ParseError::Basic(e)),
+                            Ok(t) => Err(ParseError::Basic(BasicParseError::UnexpectedToken(t.clone()))),


And, I think that means this clone is not needed?

emilio · 2017-07-23T20:23:42Z

components/selectors/parser.rs

@@ -1603,27 +1605,28 @@ fn parse_one_simple_selector<'i, 't, P, E, Impl>(parser: &P,
    where P: Parser<'i, Impl=Impl, Error=E>, Impl: SelectorImpl
 {
    let start_position = input.position();
-    match input.next_including_whitespace() {
+    // FIXME: remove clone() when lifetimes are non-lexical
+    match input.next_including_whitespace().map(|t| t.clone()) {


I think you should be able to use cloned() here too.

emilio · 2017-07-23T20:23:42Z

components/style/gecko/media_queries.rs

-            let mut flags = 0;
-            let result = {
-                let mut feature_name = &*ident;
+            // FIXME: remove extra indented block when lifetimes are non-lexical


Do we have an ETA on this? :(

There’s a draft RFC and prototype: http://smallcultfollowing.com/babysteps/blog/2017/07/11/non-lexical-lifetimes-draft-rfc-and-prototype-available/ . I’m hopeful it’ll land in stable in 2018.


        Update cssparser to 0.18

servo/rust-cssparser#171

SimonSapin · 2017-07-24T10:52:42Z

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

@bors-servo r=emilio

bors-servo · 2017-07-24T10:52:43Z

📌 Commit eb98ae6 has been approved by emilio

bors-servo · 2017-07-24T13:27:01Z

⌛ Testing commit eb98ae6 with merge 4f08211...


        Auto merge of #17820 - servo:token-cache, r=emilio

Update cssparser to 0.18 Do not merge yet, depends on servo/rust-cssparser#171.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17820)

bors-servo · 2017-07-24T14:35:55Z

☀️ 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: emilio
Pushing 4f08211 to master...

highfive assigned asajeffrey Jul 21, 2017

highfive added the S-awaiting-review label Jul 21, 2017

bors-servo added a commit that referenced this pull request Jul 21, 2017

Auto merge of #17820 - servo:token-cache, r=<try>

Loading status checks…

c3738e8

Update cssparser to 0.18 Do not merge yet, depends on servo/rust-cssparser#171.

highfive added the S-tests-failed label Jul 21, 2017

highfive added the S-needs-rebase label Jul 21, 2017

SimonSapin force-pushed the token-cache branch from 3a5c6b0 to 584c994 Jul 21, 2017

highfive removed the S-tests-failed label Jul 21, 2017

SimonSapin force-pushed the token-cache branch from 584c994 to 17b8577 Jul 21, 2017

SimonSapin force-pushed the token-cache branch from 17b8577 to 80047f9 Jul 22, 2017

SimonSapin mentioned this pull request Jul 23, 2017

Add a one-token cache servo/rust-cssparser#171

Merged

emilio approved these changes Jul 23, 2017

View changes

SimonSapin force-pushed the token-cache branch from 80047f9 to 3f7decd Jul 24, 2017

Update cssparser to 0.18

Loading status checks…

eb98ae6

servo/rust-cssparser#171

SimonSapin force-pushed the token-cache branch from 3f7decd to eb98ae6 Jul 24, 2017

highfive assigned emilio and unassigned asajeffrey Jul 24, 2017

highfive removed S-awaiting-review S-needs-rebase labels Jul 24, 2017

highfive added the S-awaiting-merge label Jul 24, 2017

highfive removed the S-awaiting-merge label Jul 24, 2017

SimonSapin deleted the token-cache branch Jul 24, 2017

bors-servo mentioned this pull request Jul 24, 2017

Servo's async Tokenizer: New! Improved! Now with multithreading! #17565

Merged

1 of 5 tasks complete

servo / servo

Update cssparser to 0.18 #17820

Update cssparser to 0.18 #17820

SimonSapin commented Jul 21, 2017 •

edited

highfive commented Jul 21, 2017

highfive commented Jul 21, 2017

SimonSapin commented Jul 21, 2017

bors-servo commented Jul 21, 2017

bors-servo commented Jul 21, 2017

bors-servo commented Jul 21, 2017

SimonSapin commented Jul 21, 2017

bors-servo commented Jul 21, 2017

bors-servo commented Jul 21, 2017

emilio left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

SimonSapin commented Jul 24, 2017

bors-servo commented Jul 24, 2017

bors-servo commented Jul 24, 2017

bors-servo commented Jul 24, 2017

servo / servo

Join GitHub today

Update cssparser to 0.18 #17820

Update cssparser to 0.18 #17820

Conversation

SimonSapin commented Jul 21, 2017 • edited

highfive commented Jul 21, 2017

highfive commented Jul 21, 2017

SimonSapin commented Jul 21, 2017

bors-servo commented Jul 21, 2017

bors-servo commented Jul 21, 2017

bors-servo commented Jul 21, 2017

SimonSapin commented Jul 21, 2017

bors-servo commented Jul 21, 2017

bors-servo commented Jul 21, 2017

emilio left a comment

This comment has been minimized.

emilio Jul 23, 2017

This comment has been minimized.

SimonSapin Jul 23, 2017

This comment has been minimized.

emilio Jul 23, 2017

This comment has been minimized.

SimonSapin Jul 24, 2017

This comment has been minimized.

emilio Jul 23, 2017

This comment has been minimized.

emilio Jul 23, 2017

This comment has been minimized.

SimonSapin Jul 23, 2017

SimonSapin commented Jul 24, 2017

bors-servo commented Jul 24, 2017

bors-servo commented Jul 24, 2017

bors-servo commented Jul 24, 2017

SimonSapin commented Jul 21, 2017 •

edited