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 all uses of the style::stylearc alias with servo_arc. #17775

Merged
merged 1 commit into from Jul 19, 2017

Conversation

@michael-p
Copy link
Contributor

michael-p commented Jul 18, 2017

The stylearc alias is left there temporarilly and will be removed completely in a later commit/PR where also components/style/gecko/generated/structs_{debug|release}.rs are re-generated (they still use the old alias).


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

This change is Reviewable

@highfive
Copy link

highfive commented Jul 18, 2017

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

@highfive
Copy link

highfive commented Jul 18, 2017

Heads up! This PR modifies the following files:

  • @bholley: components/style/stylesheets/style_rule.rs, components/style/sharing/checks.rs, components/style/gecko/url.rs, components/style/stylist.rs, components/style/properties/gecko.mako.rs and 35 more
  • @canaltinova: components/style/stylesheets/style_rule.rs, components/style/sharing/checks.rs, components/style/gecko/url.rs, components/style/stylist.rs, components/style/properties/gecko.mako.rs and 35 more
  • @KiChjang: components/script/dom/csskeyframesrule.rs, components/script/dom/htmlobjectelement.rs, components/script/Cargo.toml, components/script/dom/node.rs, components/script/dom/cssfontfacerule.rs and 26 more
  • @fitzgen: components/script/dom/csskeyframesrule.rs, components/script/dom/htmlobjectelement.rs, components/script/Cargo.toml, components/script/dom/node.rs, components/script/dom/cssfontfacerule.rs and 26 more
  • @emilio: ports/geckolib/glue.rs, components/style/stylesheets/style_rule.rs, ports/geckolib/lib.rs, components/style/sharing/checks.rs, components/style/gecko/url.rs and 58 more
@highfive
Copy link

highfive commented Jul 18, 2017

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
@michael-p
Copy link
Contributor Author

michael-p commented Jul 18, 2017

@highfive highfive assigned Manishearth and unassigned glennw Jul 18, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2017

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

@michael-p michael-p force-pushed the michael-p:rename-stylearc-to-servo-arc branch from 71fafc5 to e3ed38b Jul 19, 2017
The alias is left there temporarilly and will be removed completely in a later commit where
also components/style/gecko/generated/structs_{debug|release}.rs are re-generated (they still
use the old alias).
@michael-p michael-p force-pushed the michael-p:rename-stylearc-to-servo-arc branch from e3ed38b to b07ebba Jul 19, 2017
@emilio
Copy link
Member

emilio commented Jul 19, 2017

@bors-servo r+

Looks good, thanks!

@bors-servo
Copy link
Contributor

bors-servo commented Jul 19, 2017

📌 Commit b07ebba has been approved by emilio

@bors-servo
Copy link
Contributor

bors-servo commented Jul 19, 2017

Testing commit b07ebba with merge 31228c1...

bors-servo added a commit that referenced this pull request Jul 19, 2017
Replace all uses of the style::stylearc alias with servo_arc.

The `stylearc` alias is left there temporarilly and will be removed completely in a later commit/PR where also `components/style/gecko/generated/structs_{debug|release}.rs` are re-generated (they still use the old alias).

---
<!-- 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 #17768  (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because no new features / only refactoring

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

bors-servo commented Jul 19, 2017

@bors-servo bors-servo merged commit b07ebba 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.

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