Skip to content

Apply IWYU feedback #13

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
saki7 merged 2 commits into from
Feb 6, 2026
Merged

Apply IWYU feedback #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f14c6fb
Apply IWYU feedback
yaito3014 Feb 6, 2026
5cfa55a
Merge branch 'main' into apply-iwyu-feedback
saki7 Feb 6, 2026
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
8 changes: 4 additions & 4 deletions include/iris/rvariant.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

// SPDX-License-Identifier: MIT

#include <iris/rvariant/recursive_wrapper.hpp>
#include <iris/rvariant/rvariant.hpp>
#include <iris/rvariant/recursive_wrapper.hpp> // IWYU pragma: export
#include <iris/rvariant/rvariant.hpp> // IWYU pragma: export
//#include <iris/rvariant/rvariant_io.hpp> // not included
#include <iris/rvariant/subset.hpp>
#include <iris/rvariant/pack.hpp>
#include <iris/rvariant/subset.hpp> // IWYU pragma: export
#include <iris/rvariant/pack.hpp> // IWYU pragma: export

#endif
2 changes: 2 additions & 0 deletions include/iris/rvariant/detail/recursive_traits.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

// SPDX-License-Identifier: MIT

// IWYU pragma: private, include <iris/rvariant.hpp>

#include <iris/rvariant/detail/rvariant_fwd.hpp>
#include <iris/type_traits.hpp>

Expand Down
2 changes: 2 additions & 0 deletions include/iris/rvariant/detail/variant_storage.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

// SPDX-License-Identifier: MIT

// IWYU pragma: private, include <iris/rvariant.hpp>

#include <iris/rvariant/detail/rvariant_fwd.hpp>
#include <iris/rvariant/variant_helper.hpp>

Expand Down
2 changes: 2 additions & 0 deletions include/iris/rvariant/detail/visit.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

// SPDX-License-Identifier: MIT

// IWYU pragma: private, include <iris/rvariant.hpp>

#include <iris/rvariant/detail/rvariant_fwd.hpp>
#include <iris/rvariant/detail/seq.hpp>
#include <iris/rvariant/detail/variant_storage.hpp>
Expand Down
2 changes: 1 addition & 1 deletion include/iris/rvariant/rvariant.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <iris/rvariant/detail/variant_storage.hpp>
#include <iris/rvariant/detail/visit.hpp>
#include <iris/rvariant/detail/recursive_traits.hpp>
#include <iris/rvariant/variant_helper.hpp>
#include <iris/rvariant/variant_helper.hpp> // IWYU pragma: export
#include <iris/rvariant/subset.hpp>

#include <iris/hash/FNV_hash.hpp>
Expand Down
4 changes: 2 additions & 2 deletions include/iris/type_traits.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

#include <iris/config.hpp>

#include <iris/bits/is_function_object.hpp>
#include <iris/bits/specialization_of.hpp>
#include <iris/bits/is_function_object.hpp> // IWYU pragma: export
#include <iris/bits/specialization_of.hpp> // IWYU pragma: export

#include <iris/requirements.hpp>

Expand Down
4 changes: 4 additions & 0 deletions test/rvariant/core_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@

#include <catch2/catch_test_macros.hpp>

#include <concepts>
#include <utility>
#include <type_traits>

namespace unit_test {

TEST_CASE("pack_indexing")
Expand Down
4 changes: 3 additions & 1 deletion test/rvariant/flexible_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@

#include "iris/rvariant.hpp"

#include <catch2/catch_test_macros.hpp>
#include <type_traits>
#include <utility>
#include <variant>

namespace unit_test {

Expand Down
10 changes: 7 additions & 3 deletions test/rvariant/get_visit_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,20 @@

#include "rvariant_test.hpp"

#include "iris/rvariant/rvariant.hpp"
#include "iris/rvariant/recursive_wrapper.hpp"
#include "iris/rvariant/variant_helper.hpp"
#include "iris/rvariant.hpp"

#include "iris/type_traits.hpp"

#include <catch2/catch_test_macros.hpp>

#include <concepts>
#include <string_view>
#include <string>
#include <type_traits>
#include <utility>
#include <variant>

#include <cstddef>

namespace unit_test {

Expand Down
17 changes: 8 additions & 9 deletions test/rvariant/rvariant_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,24 @@

#include "rvariant_test.hpp"

#include "iris/rvariant/recursive_wrapper.hpp"
#include "iris/rvariant/rvariant.hpp"
#include "iris/rvariant/pack.hpp"
#include "iris/rvariant.hpp"

#include "iris/compare.hpp"
#include "iris/hash.hpp"
#include "iris/indirect.hpp"
#include "iris/type_traits.hpp"

#include <catch2/catch_test_macros.hpp>

#include <algorithm>
#include <array>
#include <bit>
#include <concepts>
#include <exception>
#include <memory>
#include <type_traits>
#include <utility>
#include <variant>
#include <vector>
#include <algorithm>
#include <ranges>
#include <bit>
#include <array>
#include <print>

#include <cstddef>

Expand Down
11 changes: 7 additions & 4 deletions test/rvariant/rvariant_test.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,22 @@

// SPDX-License-Identifier: MIT

#include "iris/rvariant/rvariant.hpp"
#include "iris/format_traits.hpp"
#include "iris/rvariant/rvariant.hpp" // IWYU pragma: export
#include "iris/format_traits.hpp" // IWYU pragma: export

#include <catch2/catch_test_macros.hpp>
#include <catch2/catch_test_macros.hpp> // IWYU pragma: export

#include <iosfwd>
#include <string>
#include <compare>
#include <functional>
#include <exception>
#include <stdexcept>
#include <type_traits>
#include <utility>
#include <format>

#include <cstddef>

#define IRIS_REQUIRE_STATIC_NOTHROW(...) \
STATIC_REQUIRE(noexcept(__VA_ARGS__)); \
REQUIRE_NOTHROW(__VA_ARGS__)
Expand Down
7 changes: 5 additions & 2 deletions test/rvariant/truly_recursive_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
// SPDX-License-Identifier: MIT

#include "iris/rvariant/recursive_wrapper.hpp"
#include "iris/rvariant/rvariant.hpp"
#include "iris/rvariant.hpp"

#include <catch2/catch_test_macros.hpp>

#include <type_traits>
#include <utility>
#include <variant>

namespace unit_test {

#ifdef _MSC_VER
Expand Down
2 changes: 1 addition & 1 deletion test/test.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@

#include <iris/config.hpp>

#include <catch2/catch_test_macros.hpp>
#include <catch2/catch_test_macros.hpp> // IWYU pragma: export

#endif