Skip to content

style(clang-tidy): Clean include headers of src/core/jsonschema #1650

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

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

style(clang-tidy): Clean include headers of src/core/jsonschema #1650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4e23031
style(clang-tidy): Clean include headers of src/core/jsonschema
bavulapati May 21, 2025
2ab35b6
Update src/core/jsonschema/bundle.cc
bavulapati May 21, 2025
c5b3460
Order the includes
bavulapati May 21, 2025
2057245
fix lint errors
bavulapati May 23, 2025
4525de9
Use NOLINT
bavulapati May 23, 2025
22f2618
Use NOLINT for all the private headers of a public header
bavulapati May 23, 2025
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
16 changes: 12 additions & 4 deletions src/core/jsonschema/bundle.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
#include <sourcemeta/core/json_value.h>
#include <sourcemeta/core/jsonpointer.h>
#include <sourcemeta/core/jsonschema.h>

#include <cassert> // assert
#include <sstream> // std::ostringstream
#include <utility> // std::move
#include <sourcemeta/core/jsonschema_error.h>
#include <sourcemeta/core/jsonschema_frame.h>
#include <sourcemeta/core/jsonschema_types.h>

#include <cassert> // assert
#include <cstddef> // std::size_t
#include <optional> // std::nullopt
#include <sstream> // std::ostringstream
#include <string> // std::string
#include <utility> // std::move

namespace {

Expand Down
11 changes: 11 additions & 0 deletions src/core/jsonschema/frame.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
#include <sourcemeta/core/json_value.h>
#include <sourcemeta/core/jsonpointer.h>
#include <sourcemeta/core/jsonschema.h>
#include <sourcemeta/core/jsonschema_error.h>
#include <sourcemeta/core/jsonschema_frame.h>
#include <sourcemeta/core/jsonschema_types.h>
#include <sourcemeta/core/jsonschema_walker.h>
#include <sourcemeta/core/uri.h>

#include <algorithm> // std::sort, std::all_of, std::any_of
#include <cassert> // assert
#include <cstddef> // std::size_t
#include <cstdint> // std::uint8_t
#include <functional> // std::less
#include <iterator> // std::next
#include <map> // std::map
#include <optional> // std::optional
#include <ostream> // std::ostream
#include <set> // std::set
#include <sstream> // std::ostringstream
#include <utility> // std::pair, std::move
Expand Down
10 changes: 6 additions & 4 deletions src/core/jsonschema/include/sourcemeta/core/jsonschema.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,22 @@
#include <sourcemeta/core/jsonschema_export.h>
#endif

#include <sourcemeta/core/json.h>
#include <sourcemeta/core/json.h> // NOLINT(misc-include-cleaner) Public header needs it
#include <sourcemeta/core/json_value.h>
#include <sourcemeta/core/jsonpointer.h>

// NOLINTBEGIN(misc-include-cleaner)
#include <sourcemeta/core/jsonschema_error.h>
#include <sourcemeta/core/jsonschema_frame.h>
#include <sourcemeta/core/jsonschema_resolver.h>
#include <sourcemeta/core/jsonschema_transform.h>
#include <sourcemeta/core/jsonschema_types.h>
#include <sourcemeta/core/jsonschema_walker.h>
// NOLINTEND(misc-include-cleaner)

#include <sourcemeta/core/uri.h>

#include <cstdint> // std::uint8_t
#include <functional> // std::function
#include <optional> // std::optional, std::nullopt
#include <set> // std::set
#include <string> // std::string
#include <string_view> // std::string_view

Expand Down
8 changes: 4 additions & 4 deletions src/core/jsonschema/include/sourcemeta/core/jsonschema_error.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
#endif

#include <sourcemeta/core/jsonpointer.h>
#include <sourcemeta/core/uri.h>

#include <exception> // std::exception
#include <string> // std::string
#include <utility> // std::move
#include <exception> // std::exception
#include <string> // std::string
#include <string_view> // std::string_view
#include <utility> // std::move

namespace sourcemeta::core {

Expand Down
23 changes: 9 additions & 14 deletions src/core/jsonschema/include/sourcemeta/core/jsonschema_frame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,18 @@
#include <sourcemeta/core/jsonschema_export.h>
#endif

#include <sourcemeta/core/json.h>
#include <sourcemeta/core/json_value.h>
#include <sourcemeta/core/jsonpointer.h>

#include <sourcemeta/core/jsonschema_resolver.h>
#include <sourcemeta/core/jsonschema_types.h>
#include <sourcemeta/core/jsonschema_walker.h>

#include <cstdint> // std::uint8_t
#include <functional> // std::reference_wrapper
#include <map> // std::map
#include <optional> // std::optional
#include <ostream> // std::ostream
#include <set> // std::set
#include <tuple> // std::tuple
#include <unordered_set> // std::unordered_set
#include <utility> // std::pair
#include <vector> // std::vector
#include <cstdint> // std::uint8_t
#include <functional> // std::reference_wrapper
#include <map> // std::map
#include <optional> // std::optional
#include <ostream> // std::ostream
#include <set> // std::set
#include <utility> // std::pair
#include <vector> // std::vector

namespace sourcemeta::core {

Expand Down
2 changes: 2 additions & 0 deletions src/core/jsonschema/include/sourcemeta/core/jsonschema_resolver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@
#endif

#include <sourcemeta/core/json.h>
#include <sourcemeta/core/json_value.h>
#include <sourcemeta/core/jsonschema_types.h>

#include <filesystem> // std::filesystem
#include <functional> // std::function
#include <map> // std::map
#include <optional> // std::optional
#include <string> // std::string
#include <string_view> // std::string_view

namespace sourcemeta::core {
Expand Down
9 changes: 3 additions & 6 deletions src/core/jsonschema/include/sourcemeta/core/jsonschema_transform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,21 @@
#include <sourcemeta/core/jsonschema_export.h>
#endif

#include <sourcemeta/core/json.h>
#include <sourcemeta/core/json_value.h>
#include <sourcemeta/core/jsonpointer.h>
#include <sourcemeta/core/uri.h>

#include <sourcemeta/core/jsonschema_resolver.h>
#include <sourcemeta/core/jsonschema_frame.h>
#include <sourcemeta/core/jsonschema_types.h>

#include <cassert> // assert
#include <concepts> // std::derived_from
#include <functional> // std::function
#include <map> // std::map
#include <memory> // std::make_unique, std::unique_ptr
#include <optional> // std::optional, std::nullopt
#include <set> // std::set
#include <string> // std::string
#include <string_view> // std::string_view
#include <utility> // std::move, std::forward, std::pair
#include <variant> // std::variant
#include <vector> // std::vector

namespace sourcemeta::core {

Expand Down
2 changes: 1 addition & 1 deletion src/core/jsonschema/include/sourcemeta/core/jsonschema_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef SOURCEMETA_CORE_JSONSCHEMA_TYPES_H_
#define SOURCEMETA_CORE_JSONSCHEMA_TYPES_H_

#include <sourcemeta/core/json.h>
#include <sourcemeta/core/json_value.h>
#include <sourcemeta/core/jsonpointer.h>
#include <sourcemeta/core/uri.h>

Expand Down
11 changes: 4 additions & 7 deletions src/core/jsonschema/include/sourcemeta/core/jsonschema_walker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,12 @@
#include <sourcemeta/core/jsonschema_export.h>
#endif

#include <sourcemeta/core/json.h>

#include <sourcemeta/core/json_value.h>
#include <sourcemeta/core/jsonschema_types.h>

#include <cstdint> // std::uint64_t
#include <optional> // std::optional
#include <string> // std::string
#include <string_view> // std::string_view
#include <vector> // std::vector
#include <optional> // std::optional
#include <string> // std::string
#include <vector> // std::vector

namespace sourcemeta::core {

Expand Down
11 changes: 11 additions & 0 deletions src/core/jsonschema/jsonschema.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
#include <sourcemeta/core/json_value.h>
#include <sourcemeta/core/jsonpointer.h>
#include <sourcemeta/core/jsonschema.h>
#include <sourcemeta/core/jsonschema_error.h>
#include <sourcemeta/core/jsonschema_frame.h>
#include <sourcemeta/core/jsonschema_types.h>
#include <sourcemeta/core/jsonschema_walker.h>
#include <sourcemeta/core/uri.h>

#include <cassert> // assert
#include <cstdint> // std::uint64_t
#include <functional> // std::less
#include <limits> // std::numeric_limits
#include <map> // std::map
#include <numeric> // std::accumulate
#include <optional> // std::optional
#include <sstream> // std::ostringstream
#include <string> // std::string
#include <string_view> // std::string_view
#include <type_traits> // std::remove_reference_t
#include <utility> // std::move

Expand Down
5 changes: 5 additions & 0 deletions src/core/jsonschema/official_resolver.in.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
#include <sourcemeta/core/json.h>
#include <sourcemeta/core/json_value.h>
#include <sourcemeta/core/jsonschema.h>

#include <optional> // std::optional
#include <string_view> // std::string_view

auto sourcemeta::core::schema_official_resolver(std::string_view identifier)
-> std::optional<sourcemeta::core::JSON> {
// JSON Schema 2020-12
Expand Down
4 changes: 4 additions & 0 deletions src/core/jsonschema/official_walker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#include <sourcemeta/core/jsonschema.h>
#include <sourcemeta/core/jsonschema_types.h>

#include <optional> // std::nullopt
#include <string_view> // std::string_view

auto sourcemeta::core::schema_official_walker(
std::string_view keyword,
Expand Down
22 changes: 17 additions & 5 deletions src/core/jsonschema/resolver.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@
#include <sourcemeta/core/json_value.h>
#include <sourcemeta/core/jsonpointer.h>
#include <sourcemeta/core/jsonschema.h>

#include <algorithm> // std::transform
#include <cassert> // assert
#include <cctype> // std::tolower
#include <sstream> // std::ostringstream
#include <sourcemeta/core/jsonschema_error.h>
#include <sourcemeta/core/jsonschema_frame.h>
#include <sourcemeta/core/jsonschema_resolver.h>
#include <sourcemeta/core/jsonschema_types.h>

#include <algorithm> // std::transform
#include <cassert> // assert
#include <cctype> // std::tolower
#include <filesystem> // std::filesystem
#include <functional> // std::function
#include <optional> // std::optional
#include <sstream> // std::ostringstream
#include <string> // std::string
#include <string_view> // std::string_view
#include <utility> // std::move

namespace sourcemeta::core {

Expand Down
9 changes: 9 additions & 0 deletions src/core/jsonschema/transformer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
#include <sourcemeta/core/json_value.h>
#include <sourcemeta/core/jsonpointer.h>
#include <sourcemeta/core/jsonschema.h>
#include <sourcemeta/core/jsonschema_error.h>
#include <sourcemeta/core/jsonschema_frame.h>
#include <sourcemeta/core/jsonschema_transform.h>
#include <sourcemeta/core/jsonschema_types.h>

#include <cassert> // assert
#include <optional> // std::optional
#include <set> // std::set
#include <sstream> // std::ostringstream
#include <stdexcept> // std::runtime_error
#include <string> // std::string
#include <utility> // std::move, std::pair
#include <variant> // std::holds_alternative, std::get_if

namespace {

Expand Down
10 changes: 10 additions & 0 deletions src/core/jsonschema/walker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
#include <sourcemeta/core/json_value.h>
#include <sourcemeta/core/jsonpointer.h>
#include <sourcemeta/core/jsonschema.h>
#include <sourcemeta/core/jsonschema_types.h>
#include <sourcemeta/core/jsonschema_walker.h>

#include <algorithm> // std::max, std::sort
#include <cassert> // assert
#include <cstddef> // std::size_t
#include <cstdint> // std::uint8_t
#include <optional> // std::optional
#include <string> // std::string
#include <utility> // std::move
#include <vector> // std::vector

namespace {
enum class SchemaWalkerType_t : std::uint8_t { Deep, Flat };
Expand Down
1 change: 1 addition & 0 deletions src/extension/alterschema/alterschema.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <sourcemeta/core/alterschema.h>
#include <sourcemeta/core/jsonschema_transform.h>

#include <cassert> // assert

Expand Down
1 change: 1 addition & 0 deletions src/extension/alterschema/include/sourcemeta/core/alterschema.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#endif

#include <sourcemeta/core/jsonschema.h>
#include <sourcemeta/core/jsonschema_transform.h>

namespace sourcemeta::core {

Expand Down
1 change: 1 addition & 0 deletions test/jsonschema/jsonschema_base_dialect_test.cc
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

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

These tests look off. The tests should not be including jsonschema_error if they already include jsonschema, as that one includes the other?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

As I mentioned earlier, clang-tidy expects the includes to be direct not transitive

Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <sourcemeta/core/json.h>
#include <sourcemeta/core/jsonschema.h>
#include <sourcemeta/core/jsonschema_error.h>

#include <string> // std::string

Expand Down
1 change: 1 addition & 0 deletions test/jsonschema/jsonschema_bundle_2019_09_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <sourcemeta/core/json.h>
#include <sourcemeta/core/jsonschema.h>
#include <sourcemeta/core/jsonschema_error.h>

#include <string> // std::string
#include <string_view> // std::string_view
Expand Down
1 change: 1 addition & 0 deletions test/jsonschema/jsonschema_bundle_2020_12_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <sourcemeta/core/json.h>
#include <sourcemeta/core/jsonschema.h>
#include <sourcemeta/core/jsonschema_error.h>

#include <string> // std::string
#include <string_view> // std::string_view
Expand Down
1 change: 1 addition & 0 deletions test/jsonschema/jsonschema_bundle_draft0_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <sourcemeta/core/json.h>
#include <sourcemeta/core/jsonschema.h>
#include <sourcemeta/core/jsonschema_error.h>

#include <string> // std::string
#include <string_view> // std::string_view
Expand Down
1 change: 1 addition & 0 deletions test/jsonschema/jsonschema_bundle_draft1_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <sourcemeta/core/json.h>
#include <sourcemeta/core/jsonschema.h>
#include <sourcemeta/core/jsonschema_error.h>

#include <string> // std::string
#include <string_view> // std::string_view
Expand Down
1 change: 1 addition & 0 deletions test/jsonschema/jsonschema_bundle_draft2_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <sourcemeta/core/json.h>
#include <sourcemeta/core/jsonschema.h>
#include <sourcemeta/core/jsonschema_error.h>

#include <string> // std::string
#include <string_view> // std::string_view
Expand Down
1 change: 1 addition & 0 deletions test/jsonschema/jsonschema_bundle_draft3_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <sourcemeta/core/json.h>
#include <sourcemeta/core/jsonschema.h>
#include <sourcemeta/core/jsonschema_error.h>

#include <string> // std::string
#include <string_view> // std::string_view
Expand Down
1 change: 1 addition & 0 deletions test/jsonschema/jsonschema_bundle_draft4_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <sourcemeta/core/json.h>
#include <sourcemeta/core/jsonschema.h>
#include <sourcemeta/core/jsonschema_error.h>

#include <string> // std::string
#include <string_view> // std::string_view
Expand Down
1 change: 1 addition & 0 deletions test/jsonschema/jsonschema_bundle_draft6_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <sourcemeta/core/json.h>
#include <sourcemeta/core/jsonschema.h>
#include <sourcemeta/core/jsonschema_error.h>

#include <string> // std::string
#include <string_view> // std::string_view
Expand Down
1 change: 1 addition & 0 deletions test/jsonschema/jsonschema_bundle_draft7_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <sourcemeta/core/json.h>
#include <sourcemeta/core/jsonschema.h>
#include <sourcemeta/core/jsonschema_error.h>

#include <string> // std::string
#include <string_view> // std::string_view
Expand Down
Loading