Skip to content

Configure clang-format include ordering with IncludeCategories #820

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.

Sign up for GitHub

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

Merged
laurynas-biveinis merged 1 commit into from
Dec 4, 2025
Merged

Configure clang-format include ordering with IncludeCategories #820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
---
Standard: c++20
BasedOnStyle: Google
IncludeBlocks: Preserve
IncludeBlocks: Regroup
IncludeCategories:
- Regex: '^"global\.hpp"$'
Priority: -1
- Regex: '^<[a-z_]+>$'
Priority: 2
- Regex: '^<.*>$'
Priority: 3
- Regex: '^".*"$'
Priority: 4
Comment thread
laurynas-biveinis marked this conversation as resolved.
AttributeMacros:
- UNODB_DETAIL_UNUSED
- UNODB_DETAIL_USED_IN_DEBUG
Expand Down
7 changes: 3 additions & 4 deletions art_internal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@

// IWYU pragma: no_include <__ostream/basic_ostream.h>

#include "art_internal.hpp" // IWYU pragma: keep

#include "art_common.hpp"

#include <cstddef>
#include <iomanip>
#include <iostream> // IWYU pragma: keep

#include "art_common.hpp"
#include "art_internal.hpp" // IWYU pragma: keep

namespace unodb::detail {

[[gnu::cold]] UNODB_DETAIL_NOINLINE void dump_byte(std::ostream &os,
Expand Down
3 changes: 1 addition & 2 deletions benchmark/micro_benchmark.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@

#include "art_common.hpp"
#include "art_internal.hpp" // IWYU pragma: keep
#include "node_type.hpp"

#include "micro_benchmark_node_utils.hpp"
#include "micro_benchmark_utils.hpp"
#include "node_type.hpp"

namespace {

Expand Down
4 changes: 2 additions & 2 deletions qsbr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
// IWYU pragma: no_include <__new/exceptions.h>
// IWYU pragma: no_include <__hash_table>

#include "qsbr.hpp"

#include <atomic>
#include <cstdint>
#include <exception>
Expand All @@ -24,6 +22,8 @@
#include <new> // IWYU pragma: keep
#include <utility>

#include "qsbr.hpp"

#ifdef UNODB_DETAIL_WITH_STATS
#include <mutex>
#endif // UNODB_DETAIL_WITH_STATS
Expand Down
3 changes: 1 addition & 2 deletions test/db_test_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,11 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>

#include "gtest_utils.hpp"

#include "art.hpp"
#include "art_common.hpp"
#include "art_internal.hpp"
#include "assert.hpp"
#include "gtest_utils.hpp"
#include "mutex_art.hpp"
#include "node_type.hpp"
#include "olc_art.hpp"
Expand Down
1 change: 0 additions & 1 deletion test/qsbr_gtest_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "qsbr_gtest_utils.hpp" // IWYU pragma: keep

#include "qsbr.hpp"

#include "qsbr_test_utils.hpp"

namespace unodb::test {
Expand Down
Loading