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 to cssparser 0.19, count line numbers during tokenization #18025

Merged
merged 1 commit into from Aug 9, 2017

Conversation

Projects
None yet
6 participants
@SimonSapin
Copy link
Member

commented Aug 9, 2017

servo/rust-cssparser#177

Also simplify the ParseErrorReporter trait a bit.


This change is Reviewable

@highfive

This comment has been minimized.

Copy link

commented Aug 9, 2017

Heads up! This PR modifies the following files:

  • @bholley: components/style/stylesheets/viewport_rule.rs, components/style/values/specified/calc.rs, components/style/stylesheets/rule_parser.rs, components/style/properties/properties.mako.rs, components/style/Cargo.toml and 10 more
  • @canaltinova: components/style/stylesheets/viewport_rule.rs, components/style/values/specified/calc.rs, components/style/stylesheets/rule_parser.rs, components/style/properties/properties.mako.rs, components/style/Cargo.toml and 10 more
  • @KiChjang: components/script/Cargo.toml, components/script_layout_interface/Cargo.toml, components/script_layout_interface/reporter.rs
  • @fitzgen: components/script/Cargo.toml, components/script_layout_interface/Cargo.toml, components/script_layout_interface/reporter.rs
  • @emilio: components/style/stylesheets/viewport_rule.rs, components/style/values/specified/calc.rs, components/style/stylesheets/rule_parser.rs, components/style/properties/properties.mako.rs, components/style/Cargo.toml and 12 more
@jdm

This comment has been minimized.

Copy link
Member

commented Aug 9, 2017

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Aug 9, 2017

📌 Commit 9554f5a has been approved by jdm

@highfive highfive assigned jdm and unassigned cbrewster Aug 9, 2017

@emilio

emilio approved these changes Aug 9, 2017

Copy link
Member

left a comment

r=me

@emilio

This comment has been minimized.

Copy link
Member

commented Aug 9, 2017

Oh, or r=jdm, I guess :)

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Aug 9, 2017

⌛️ Testing commit 9554f5a with merge 22383c4...

bors-servo added a commit that referenced this pull request Aug 9, 2017

Auto merge of #18025 - servo:line-counting, r=jdm
Update to cssparser 0.19, count line numbers during tokenization

servo/rust-cssparser#177

Also simplify the `ParseErrorReporter` trait a bit.

<!-- 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/18025)
<!-- Reviewable:end -->
@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Aug 9, 2017

💔 Test failed - mac-dev-unit

@jdm

This comment has been minimized.

Copy link
Member

commented Aug 9, 2017

error[E0412]: cannot find type `UrlExtraData` in this scope
  --> /Users/servo/buildbot/slave/mac-dev-unit/build/tests/unit/style/media_queries.rs:25:28
   |
25 |                     _url: &UrlExtraData,
   |                            ^^^^^^^^^^^^ not found in this scope
   |
help: possible candidate is found in another module, you can import it into scope
   |
29 | use style::stylesheets::UrlExtraData;
   |

error[E0412]: cannot find type `SourceLocation` in this scope
  --> /Users/servo/buildbot/slave/mac-dev-unit/build/tests/unit/style/media_queries.rs:26:32
   |
26 |                     _location: SourceLocation,
   |                                ^^^^^^^^^^^^^^ did you mean `SourcePosition`?
   |
help: possible candidate is found in another module, you can import it into scope
   |
29 | use cssparser::SourceLocation;
   |

error[E0412]: cannot find type `UrlExtraData` in this scope
  --> /Users/servo/buildbot/slave/mac-dev-unit/build/tests/unit/style/rule_tree/bench.rs:22:27
   |
22 |                     url: &UrlExtraData,
   |                           ^^^^^^^^^^^^ not found in this scope
   |
help: possible candidate is found in another module, you can import it into scope
   |
5  | use style::stylesheets::UrlExtraData;
   |

error[E0412]: cannot find type `SourceLocation` in this scope
  --> /Users/servo/buildbot/slave/mac-dev-unit/build/tests/unit/style/rule_tree/bench.rs:23:31
   |
23 |                     location: SourceLocation,
   |                               ^^^^^^^^^^^^^^ did you mean `SourcePosition`?
   |
help: possible candidate is found in another module, you can import it into scope
   |
5  | use cssparser::SourceLocation;
   |

error[E0412]: cannot find type `UrlExtraData` in this scope
   --> /Users/servo/buildbot/slave/mac-dev-unit/build/tests/unit/style/stylesheets.rs:274:27
    |
274 |                     url: &UrlExtraData,
    |                           ^^^^^^^^^^^^ not found in this scope
    |
help: possible candidate is found in another module, you can import it into scope
    |
37  | use style::stylesheets::UrlExtraData;

@SimonSapin SimonSapin force-pushed the line-counting branch from 9554f5a to 7382dad Aug 9, 2017

@SimonSapin

This comment has been minimized.

Copy link
Member Author

commented Aug 9, 2017

Fixed.

@bors-servo r=jdm

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Aug 9, 2017

📌 Commit 7382dad has been approved by jdm

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Aug 9, 2017

⌛️ Testing commit 7382dad with merge 845131c...

bors-servo added a commit that referenced this pull request Aug 9, 2017

Auto merge of #18025 - servo:line-counting, r=jdm
Update to cssparser 0.19, count line numbers during tokenization

servo/rust-cssparser#177

Also simplify the `ParseErrorReporter` trait a bit.

<!-- 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/18025)
<!-- Reviewable:end -->
@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Aug 9, 2017

@bors-servo bors-servo merged commit 7382dad into master Aug 9, 2017

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details

@bors-servo bors-servo referenced this pull request Aug 9, 2017

Merged

Improved WebGL architecture #17891

3 of 5 tasks complete

@SimonSapin SimonSapin deleted the line-counting branch Aug 29, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.