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

Initial expansion of if-brackets in all collector/lib files #1849

Merged
merged 6 commits into from
Sep 18, 2024

Conversation

SimonBaeumer
Copy link
Member

@SimonBaeumer SimonBaeumer commented Sep 17, 2024

Description

This PR runs the expand brackets option of the clang-format tool.

I've extracted some other parts of the PR, mainly because the clang-format requires an update. To avoid merge conflicts this PR only provides the initial formatting.

Subsequent PRs:

Copy link
Collaborator

@Molter73 Molter73 left a comment

Choose a reason for hiding this comment

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

Looks good! Thanks for putting this together!

Main concern is that the optionparser.h file shouldn't be formatted, other than that LGTM!

Makefile Outdated Show resolved Hide resolved
collector/lib/CollectorStatsExporter.cpp Show resolved Hide resolved
collector/lib/optionparser.h Outdated Show resolved Hide resolved
@Molter73
Copy link
Collaborator

Molter73 commented Sep 17, 2024

Looks like CI is using an old version of clang-format, I'm looking into why it's doing that and how we can update it to at least 15.

@Molter73
Copy link
Collaborator

Looks like CI is using an old version of clang-format, I'm looking into why it's doing that and how we can update it to at least 15.

Ok, seems there are 2 options here:

@SimonBaeumer SimonBaeumer changed the title Enable expand brackets clang-format Expand if-brackets in all collector/lib files Sep 18, 2024
@SimonBaeumer SimonBaeumer changed the title Expand if-brackets in all collector/lib files Initial expansion of if-brackets in all collector/lib files Sep 18, 2024
@SimonBaeumer
Copy link
Member Author

Looks like CI is using an old version of clang-format, I'm looking into why it's doing that and how we can update it to at least 15.

Ok, seems there are 2 options here:

Tanks for looking it up! I've created a new PR to update the clang-format: #1851

This PR now focuses only on inserting the braces to avoid tedious merge conflicts.

@SimonBaeumer SimonBaeumer marked this pull request as ready for review September 18, 2024 08:36
@SimonBaeumer SimonBaeumer requested a review from a team as a code owner September 18, 2024 08:36
Copy link
Collaborator

@Molter73 Molter73 left a comment

Choose a reason for hiding this comment

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

LGTM!

@SimonBaeumer SimonBaeumer merged commit 3f10453 into master Sep 18, 2024
86 of 101 checks passed
@SimonBaeumer SimonBaeumer deleted the sb/add-expand-brackets branch September 18, 2024 08:53
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