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

Move module declarations back into lib.rs #7773

Merged
merged 2 commits into from
Oct 6, 2021

Conversation

Manishearth
Copy link
Member

@Manishearth Manishearth commented Oct 6, 2021

With #7673 we moved a lot of things from lib.rs to lib.foo.rs. Unfortunately, rustfmt doesn't seem to work when module declarations are included via include! (and trying the mod foo; use foo::*; trick doesn't seem to work much either in our specific case).

With this PR we continue generating everything in subfiles except for module declarations, which are now generated within lib.rs.

changelog: none

@rust-highfive
Copy link

r? @flip1995

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Oct 6, 2021
Copy link
Member

@flip1995 flip1995 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah this explains, why #7748 didn't get formatted right. Thanks!

@flip1995
Copy link
Member

flip1995 commented Oct 6, 2021

@bors r+ p=1

@bors
Copy link
Collaborator

bors commented Oct 6, 2021

📌 Commit d9488c5 has been approved by flip1995

bors added a commit that referenced this pull request Oct 6, 2021
Move module declarations back into lib.rs

With #7673 we moved a lot of things from lib.rs to lib.foo.rs. Unfortunately, rustfmt doesn't seem to work when module declarations are included via `include!` (and trying the `mod foo; use foo::*;` trick doesn't seem to work much either in our specific case).

With this PR we continue generating everything in subfiles except for module declarations, which are now generated within lib.rs.
@bors
Copy link
Collaborator

bors commented Oct 6, 2021

⌛ Testing commit d9488c5 with merge b505e94...

@bors
Copy link
Collaborator

bors commented Oct 6, 2021

💔 Test failed - checks-action_test

@flip1995
Copy link
Member

flip1995 commented Oct 6, 2021

@bors retry

@bors
Copy link
Collaborator

bors commented Oct 6, 2021

⌛ Testing commit d9488c5 with merge 871b8b5...

@bors
Copy link
Collaborator

bors commented Oct 6, 2021

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: flip1995
Pushing 871b8b5 to master...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants