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

Rustfmt pass #1712

Merged
merged 1 commit into from Sep 18, 2017
Merged

Rustfmt pass #1712

merged 1 commit into from Sep 18, 2017

Conversation

@kvark
Copy link
Member

kvark commented Sep 17, 2017

The settings are mostly default, I find them quite reasonable.

I didn't touch debug_font_data since it just needs to be rewritten with include_bin!.
I didn't touch debug_colors since I wasn't convinced it's worth it. Possibly disable formatting on that file as a follow up.

r? @glennw


This change is Reviewable

@glennw
Copy link
Member

glennw commented Sep 17, 2017

Thanks for doing this! CI is failing due to servo-tidy script checks :/

1.22s$ servo-tidy

Checking the config file...

Checking files for tidiness...

./wrench/src/binary_frame_reader.rs:9: use statement is not in alphabetical order

	expected: std::{mem, process}

	found: std::any::TypeId

./wrench/src/json_frame_writer.rs:10: use statement is not in alphabetical order

	expected: super::CURRENT_FRAME_NUMBER

	found: app_units::Au

./wrench/src/json_frame_writer.rs:15: use statement is not in alphabetical order

	expected: std::{fmt, fs}

	found: std::borrow::BorrowMut

./wrench/src/reftest.rs:8: use statement is not in alphabetical order

	expected: image::{ColorType, ImageFormat}

	found: image::load as load_piston_image

./wrench/src/wrench.rs:7: use statement is not in alphabetical order

	expected: {WindowWrapper, BLACK_COLOR, WHITE_COLOR}

	found: app_units::Au

./wrench/src/yaml_frame_reader.rs:6: use statement is not in alphabetical order

	expected: {BLACK_COLOR, PLATFORM_DEFAULT_FACE_NAME, WHITE_COLOR}

	found: app_units::Au

./wrench/src/yaml_frame_writer.rs:8: use statement is not in alphabetical order

	expected: super::CURRENT_FRAME_NUMBER

	found: app_units::Au

./wrench/src/yaml_frame_writer.rs:14: use statement is not in alphabetical order

	expected: std::{fmt, fs}

	found: std::borrow::BorrowMut

  Progress: 100% (308/308)

Running the dependency licensing lint...
@kvark kvark force-pushed the kvark:rustfmt branch from 334828a to 1fbc96b Sep 18, 2017
@kvark
Copy link
Member Author

kvark commented Sep 18, 2017

Any issues about the new style?
CI should be passing now.

@glennw
Copy link
Member

glennw commented Sep 18, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Sep 18, 2017

📌 Commit 1fbc96b has been approved by glennw

@bors-servo
Copy link
Contributor

bors-servo commented Sep 18, 2017

Testing commit 1fbc96b with merge 1407b1e...

bors-servo added a commit that referenced this pull request Sep 18, 2017
Rustfmt pass

The settings are mostly default, I find them quite reasonable.

I didn't touch `debug_font_data` since it just needs to be rewritten with `include_bin!`.
I didn't touch `debug_colors` since I wasn't convinced it's worth it. Possibly disable formatting on that file as a follow up.

r? @glennw

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

bors-servo commented Sep 18, 2017

☀️ Test successful - status-travis
Approved by: glennw
Pushing 1407b1e to master...

@bors-servo bors-servo merged commit 1fbc96b into servo:master Sep 18, 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
@kvark kvark deleted the kvark:rustfmt branch Sep 18, 2017
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.