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

replace vector iteration by ascii_case_insensitive_phf_map #17754

Merged
merged 1 commit into from Jul 19, 2017

Conversation

@SergeevPavel
Copy link
Contributor

SergeevPavel commented Jul 17, 2017


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #15994 (github issue number if applicable).
  • There are tests for these changes OR
  • These changes do not require tests because _____

This change is Reviewable

@highfive
Copy link

highfive commented Jul 17, 2017

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @Manishearth (or someone else) soon.

@highfive
Copy link

highfive commented Jul 17, 2017

Heads up! This PR modifies the following files:

  • @bholley: components/style/properties/longhand/color.mako.rs
  • @canaltinova: components/style/properties/longhand/color.mako.rs
  • @emilio: components/style/properties/longhand/color.mako.rs
@highfive
Copy link

highfive commented Jul 17, 2017

warning Warning warning

  • These commits modify style code, but no tests are modified. Please consider adding a test!
@SimonSapin
Copy link
Member

SimonSapin commented Jul 17, 2017

Looks good, thanks!

@bors-servo r+

@bors-servo
Copy link
Contributor

bors-servo commented Jul 17, 2017

📌 Commit 82c8dd9 has been approved by SimonSapin

@bors-servo
Copy link
Contributor

bors-servo commented Jul 17, 2017

Testing commit 82c8dd9 with merge 341bb17...

bors-servo added a commit that referenced this pull request Jul 17, 2017
replace vector iteration by ascii_case_insensitive_phf_map

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #15994 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

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

bors-servo commented Jul 17, 2017

💔 Test failed - mac-dev-unit

@SimonSapin
Copy link
Member

SimonSapin commented Jul 17, 2017

error[E0308]: mismatched types
     --> /Users/servo/buildbot/slave/mac-dev-unit/build/target/geckolib/debug/build/style-8e72fa08530fa207/out/properties.rs:19775:49
      |
19775 |                 if let Some(color) = color_name(ident) {
      |                                                 ^^^^^ expected &str, found struct `cssparser::CompactCowStr`
      |
      = note: expected type `&str`
                 found type `cssparser::CompactCowStr<'_>`
      = help: here are some functions which might fulfill your needs:
              - .trim()
              - .trim_left()
              - .trim_right()

error[E0308]: mismatched types
     --> /Users/servo/buildbot/slave/mac-dev-unit/build/target/geckolib/debug/build/style-8e72fa08530fa207/out/properties.rs:19776:24
      |
19776 |                     Ok(color)
      |                        ^^^^^ expected enum `gecko_bindings::structs::root::mozilla::LookAndFeel_ColorID`, found reference
      |
      = note: expected type `gecko_bindings::structs::root::mozilla::LookAndFeel_ColorID`
                 found type `&gecko_bindings::structs::root::mozilla::LookAndFeel_ColorID`

error: aborting due to 2 previous errors

error: Could not compile `style`.

Try color_name(&ident) and Ok(*color), and run ./mach check-geckolib to make sure it compiles.

@SergeevPavel SergeevPavel force-pushed the SergeevPavel:system-colors-refactor branch from 82c8dd9 to f3843ed Jul 17, 2017
@SergeevPavel SergeevPavel force-pushed the SergeevPavel:system-colors-refactor branch from f3843ed to 6a2f84e Jul 17, 2017
@SergeevPavel
Copy link
Contributor Author

SergeevPavel commented Jul 19, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Jul 19, 2017

@SergeevPavel: 🔑 Insufficient privileges: Not in reviewers

@jdm
Copy link
Member

jdm commented Jul 19, 2017

@bors-servo: r=SimonSapin

@bors-servo
Copy link
Contributor

bors-servo commented Jul 19, 2017

📌 Commit 6a2f84e has been approved by SimonSapin

@bors-servo
Copy link
Contributor

bors-servo commented Jul 19, 2017

Testing commit 6a2f84e with merge e7b195b...

bors-servo added a commit that referenced this pull request Jul 19, 2017
replace vector iteration by ascii_case_insensitive_phf_map

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #15994 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/17754)
<!-- Reviewable:end -->
@SergeevPavel
Copy link
Contributor Author

SergeevPavel commented Jul 19, 2017

thank for help

@emilio
Copy link
Member

emilio commented Jul 19, 2017

thank for help

Thank you!

@bors-servo
Copy link
Contributor

bors-servo commented Jul 19, 2017

@bors-servo bors-servo merged commit 6a2f84e into servo:master Jul 19, 2017
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

7 participants
You can’t perform that action at this time.