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

Format component of style_traits #21620

Merged
merged 1 commit into from Sep 9, 2018
Merged

Conversation

@chansuke
Copy link
Contributor

chansuke commented Sep 5, 2018

Format style_traits with:

rustfmt components/style_traits/*.rs

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix part of #21373.
  • These changes do not require tests because they format the components only.

This change is Reviewable

@highfive
Copy link

highfive commented Sep 5, 2018

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

@jdm
Copy link
Member

jdm commented Sep 5, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Sep 5, 2018

📌 Commit 0df74a7 has been approved by jdm

@highfive highfive assigned jdm and unassigned emilio Sep 5, 2018
@jdm jdm mentioned this pull request Sep 5, 2018
53 of 53 tasks complete
@bors-servo
Copy link
Contributor

bors-servo commented Sep 5, 2018

Testing commit 0df74a7 with merge 550b775...

bors-servo added a commit that referenced this pull request Sep 5, 2018
Format component of style_traits

<!-- Please describe your changes on the following line: -->
Format `style_traits` with:
```
rustfmt components/style_traits/*.rs
```

---
<!-- 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
- [ ] These changes fix part of #21373.
- [x] These changes do not require tests because they format the components only.

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

bors-servo commented Sep 5, 2018

💔 Test failed - linux-dev

@jdm
Copy link
Member

jdm commented Sep 5, 2018

./components/style_traits/lib.rs:28: extern crate declaration is not in alphabetical order
	expected: webrender_api
	found: servo_arc

Could you rearrange the webrender_api crate to be alphabetical?

@bors-servo
Copy link
Contributor

bors-servo commented Sep 6, 2018

Testing commit 0df74a7 with merge 424f617...

bors-servo added a commit that referenced this pull request Sep 6, 2018
Format component of style_traits

<!-- Please describe your changes on the following line: -->
Format `style_traits` with:
```
rustfmt components/style_traits/*.rs
```

---
<!-- 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
- [ ] These changes fix part of #21373.
- [x] These changes do not require tests because they format the components only.

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

bors-servo commented Sep 6, 2018

💔 Test failed - linux-dev

@chansuke chansuke force-pushed the chansuke:format_style_traits branch from 0df74a7 to 13847de Sep 7, 2018
@chansuke
Copy link
Contributor Author

chansuke commented Sep 7, 2018

@jdm Thanks for the feedback.I re-arranged and re-pushed as below.

#[cfg(feature = "servo")]
extern crate servo_arc;
extern crate webrender_api;
#[cfg(feature = "servo")]
#[macro_use]
extern crate serde;
#[cfg(feature = "servo")]

This comment has been minimized.

@jdm

jdm Sep 7, 2018

Member

This cfg(feature = "servo") needs to be moved above webrender_api instead of servo_arc.

@jdm
Copy link
Member

jdm commented Sep 7, 2018

./mach test-tidy is still complaining:

Checking files for tidiness...
./components/style_traits/lib.rs:30: extern crate declaration is not in alphabetical order
	expected: webrender_api
	found: servo_atoms
@chansuke chansuke force-pushed the chansuke:format_style_traits branch from 13847de to a2fc2ae Sep 8, 2018
@chansuke
Copy link
Contributor Author

chansuke commented Sep 9, 2018

@jdm fixed again, sorry.

@jdm
Copy link
Member

jdm commented Sep 9, 2018

cc @emilio

@jdm
Copy link
Member

jdm commented Sep 9, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Sep 9, 2018

📌 Commit a2fc2ae has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Sep 9, 2018

Testing commit a2fc2ae with merge 5455eb3...

bors-servo added a commit that referenced this pull request Sep 9, 2018
Format component of style_traits

<!-- Please describe your changes on the following line: -->
Format `style_traits` with:
```
rustfmt components/style_traits/*.rs
```

---
<!-- 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
- [ ] These changes fix part of #21373.
- [x] These changes do not require tests because they format the components only.

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

bors-servo commented Sep 9, 2018

💔 Test failed - mac-rel-wpt2

@jdm
Copy link
Member

jdm commented Sep 9, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Sep 9, 2018

Testing commit a2fc2ae with merge 6cb39fa...

bors-servo added a commit that referenced this pull request Sep 9, 2018
Format component of style_traits

<!-- Please describe your changes on the following line: -->
Format `style_traits` with:
```
rustfmt components/style_traits/*.rs
```

---
<!-- 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
- [ ] These changes fix part of #21373.
- [x] These changes do not require tests because they format the components only.

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

bors-servo commented Sep 9, 2018

@bors-servo bors-servo merged commit a2fc2ae into servo:master Sep 9, 2018
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
moz-v2v-gh pushed a commit to mozilla/gecko-dev that referenced this pull request Sep 15, 2018
jankeromnes pushed a commit to jankeromnes/gecko that referenced this pull request Sep 16, 2018
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified-and-comments-removed that referenced this pull request Oct 3, 2019
This cherry-picks servo/servo#21620.

UltraBlame original commit: d88b4c39dfce50e116436441080dcc9b4acf593e
gecko-dev-updater pushed a commit to marco-c/gecko-dev-comments-removed that referenced this pull request Oct 3, 2019
This cherry-picks servo/servo#21620.

UltraBlame original commit: d88b4c39dfce50e116436441080dcc9b4acf593e
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified that referenced this pull request Oct 3, 2019
This cherry-picks servo/servo#21620.

UltraBlame original commit: d88b4c39dfce50e116436441080dcc9b4acf593e
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.

None yet

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