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

Tidy more files #2403

Merged
merged 1 commit into from Feb 9, 2018
Merged

Tidy more files #2403

merged 1 commit into from Feb 9, 2018

Conversation

@mrobinson
Copy link
Member

mrobinson commented Feb 9, 2018

Expand servo-tidy to include webrender_api/ and webrender/ (except the
main source directory). The ordering rules for use statements seem a
little capricious, but at least these will be in line with how Servo is
formatted.


This change is Reviewable

Expand servo-tidy to include webrender_api/ and webrender/ (except the
main source directory). The ordering rules for use statements seem a
little capricious, but at least these will be in line with how Servo is
formatted.
@mrobinson mrobinson requested review from kvark and glennw Feb 9, 2018
@@ -11,14 +11,12 @@ extern crate webrender;
mod boilerplate;

use boilerplate::{Example, HandyDandyRectBuilder};
use rayon::Configuration as ThreadPoolConfig;
use rayon::ThreadPool;
use rayon::{Configuration as ThreadPoolConfig, ThreadPool};

This comment has been minimized.

@kvark

kvark Feb 9, 2018

Member

we really need to ensure that rustfmt is in agreement with servo tidy here, could you verify?

This comment has been minimized.

@mrobinson

mrobinson Feb 9, 2018

Author Member

I ran rustfmt nightly on blob.rs and it made some changes. Those changes still ran cleanly through servo-tidy, so I think it's just that servo-tidy is more stringent than rustfmt currently.

@kvark
Copy link
Member

kvark commented Feb 9, 2018

@nical are you worried about collisions with #2362 here? Would you prefer this to be delayed then? I assume re-running servo-tidy is simpler than resolving the merge conflicts.

@mrobinson
Copy link
Member Author

mrobinson commented Feb 9, 2018

@kvark I'm happy to wait until #2362 has landed, but I just confirmed that it rebases cleanly on top of this change.

@kvark
Copy link
Member

kvark commented Feb 9, 2018

ok, thanks @mrobinson !
@bors-servo r+

@bors-servo
Copy link
Contributor

bors-servo commented Feb 9, 2018

📌 Commit 035f070 has been approved by kvark

@bors-servo
Copy link
Contributor

bors-servo commented Feb 9, 2018

Testing commit 035f070 with merge d51d6ec...

bors-servo added a commit that referenced this pull request Feb 9, 2018
Tidy more files

Expand servo-tidy to include webrender_api/ and webrender/ (except the
main source directory). The ordering rules for use statements seem a
little capricious, but at least these will be in line with how Servo is
formatted.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/2403)
<!-- Reviewable:end -->
@mrobinson
Copy link
Member Author

mrobinson commented Feb 9, 2018

@kvark Thanks for the review!

@bors-servo
Copy link
Contributor

bors-servo commented Feb 9, 2018

☀️ Test successful - status-appveyor, status-taskcluster, status-travis
Approved by: kvark
Pushing d51d6ec to master...

@bors-servo bors-servo merged commit 035f070 into servo:master Feb 9, 2018
3 checks passed
3 checks passed
Taskcluster (pull_request) TaskGroup: success
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
@mrobinson mrobinson deleted the mrobinson:more-tidy branch Feb 9, 2018
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

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