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

Fix header includes. #32

Merged
merged 2 commits into from
Aug 2, 2023
Merged

Fix header includes. #32

merged 2 commits into from
Aug 2, 2023

Conversation

vamega
Copy link

@vamega vamega commented Jun 19, 2023

In #31 it was suggested that cleaning up the imports was something worth doing.

This includes the fixes for #30 and #31, and I think cleans up other imports as well.

The changes come from running the include-what-you-use tools, and then manually editing changes that were suggested.

I do have nix dev-shell set up in my import-fix-wip branch. Using include-what-you-use as nix tool seems to be broken. The dev-shell is based on work on the branch by @Et73f that I found when reading NixOS/nixpkgs#189753

The devShell isn't part of this CR

Varun Madiath added 2 commits June 19, 2023 13:39
Now builds with gcc-12 and gcc-13

Closes nixcloud#31
Closes nixcloud#30
Cleanup by running the fix-includes.py script from include-what-you-use
and manually looking over and editing the resulting changes.
@aszlig
Copy link
Contributor

aszlig commented Aug 1, 2023

@vamega: Did you run iwyu manually or as part of the Meson build process? I'm asking since the preferred way would be to run this via CI and thus quickly find new issues as soon as they're introduced.

Ah, never mind... just saw your branch and might give it a shot to integrate later.

Copy link
Contributor

@aszlig aszlig left a comment

Choose a reason for hiding this comment

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

Thanks a lot!

👍 Since it's already an improvement and addresses #30 and #31.

@aszlig aszlig merged commit 633d106 into nixcloud:master Aug 2, 2023
aszlig added a commit that referenced this pull request Aug 2, 2023
This documents the fixes introduced by the merge commit
633d106 (pull request #32).

Signed-off-by: aszlig <[email protected]>
@vamega
Copy link
Author

vamega commented Aug 2, 2023

I wasn't able to find a way to run it via meson.
I used the generated compile-commands.json, with iwyu-tool.py.

Hopefully the history of modifications in the import-fix-wip branch are helpful.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants