diff options
| author | Martin Hořeňovský | 2020-07-29 16:29:41 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2020-07-29 21:51:05 +0200 |
| commit | ed0ea3014942a952471ca32da466f5df213b5eb2 (patch) | |
| tree | 0bee82bf540fe9cf565a56c90246a4785adc07d1 /src/catch2/internal | |
| parent | 35098a62d8a8532a2f61ed28f5c097932b95fc23 (diff) | |
| download | catch3-ed0ea3014942a952471ca32da466f5df213b5eb2.tar.gz | |
Apply some IWYU suggestions
This is not nearly all of them, because IWYU does not support the
way Catch2 manages includes -- it expects that non-system includes
are done using `#include "foo/bar/baz.hpp"`, while Catch2 uses
`<foo/bar/baz.hpp>`. This causes trouble, because IWYU suggests
removing every single internal header, and then adding them again,
but using `""` in the include directive... the resulting suggestions
cannot be used without a lot of manual work, as they are largely
bogus.
For bonus points, IWYU also _loves_ to suggest kinda-random stdlib
headers for `size_t` and similar. Still, the resulting inclusion
graph is somewhat better than it was before.
Diffstat (limited to 'src/catch2/internal')
21 files changed, 25 insertions, 31 deletions
diff --git a/src/catch2/internal/catch_assertion_handler.cpp b/src/catch2/internal/catch_assertion_handler.cpp index 54153462..b666ba31 100644 --- a/src/catch2/internal/catch_assertion_handler.cpp +++ b/src/catch2/internal/catch_assertion_handler.cpp @@ -7,8 +7,6 @@ */ #include <catch2/internal/catch_assertion_handler.hpp> -#include <catch2/catch_assertion_result.hpp> -#include <catch2/interfaces/catch_interfaces_runner.hpp> #include <catch2/interfaces/catch_interfaces_config.hpp> #include <catch2/internal/catch_context.hpp> #include <catch2/internal/catch_enforce.hpp> diff --git a/src/catch2/internal/catch_clara.hpp b/src/catch2/internal/catch_clara.hpp index 633db558..2420a1d8 100644 --- a/src/catch2/internal/catch_clara.hpp +++ b/src/catch2/internal/catch_clara.hpp @@ -9,6 +9,9 @@ #ifndef TWOBLUECUBES_CATCH_CLARA_H_INCLUDED #define TWOBLUECUBES_CATCH_CLARA_H_INCLUDED +// For CATCH_CONFIG_CONSOLE_WIDTH. We should refactor this out somewhere else. +#include <catch2/catch_config.hpp> + // Use Catch's value for console width (store Clara's off to the side, if present) #ifdef CLARA_CONFIG_CONSOLE_WIDTH #define CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH diff --git a/src/catch2/internal/catch_commandline.cpp b/src/catch2/internal/catch_commandline.cpp index 2759eb8e..0f24fc95 100644 --- a/src/catch2/internal/catch_commandline.cpp +++ b/src/catch2/internal/catch_commandline.cpp @@ -8,11 +8,12 @@ #include <catch2/internal/catch_commandline.hpp> +#include <catch2/catch_config.hpp> #include <catch2/internal/catch_string_manip.hpp> - #include <catch2/interfaces/catch_interfaces_registry_hub.hpp> #include <catch2/interfaces/catch_interfaces_reporter.hpp> +#include <algorithm> #include <fstream> #include <ctime> diff --git a/src/catch2/internal/catch_commandline.hpp b/src/catch2/internal/catch_commandline.hpp index 0824397d..e0bb9b4d 100644 --- a/src/catch2/internal/catch_commandline.hpp +++ b/src/catch2/internal/catch_commandline.hpp @@ -8,11 +8,12 @@ #ifndef TWOBLUECUBES_CATCH_COMMANDLINE_HPP_INCLUDED #define TWOBLUECUBES_CATCH_COMMANDLINE_HPP_INCLUDED -#include <catch2/catch_config.hpp> #include <catch2/internal/catch_clara.hpp> namespace Catch { + struct ConfigData; + clara::Parser makeCommandLineParser( ConfigData& config ); } // end namespace Catch diff --git a/src/catch2/internal/catch_common.cpp b/src/catch2/internal/catch_common.cpp index aaf08079..eec0ed6f 100644 --- a/src/catch2/internal/catch_common.cpp +++ b/src/catch2/internal/catch_common.cpp @@ -7,8 +7,6 @@ */ #include <catch2/internal/catch_common.hpp> -#include <catch2/internal/catch_context.hpp> -#include <catch2/interfaces/catch_interfaces_config.hpp> #include <cstring> #include <ostream> diff --git a/src/catch2/internal/catch_common.hpp b/src/catch2/internal/catch_common.hpp index a46c46b3..45a1eca5 100644 --- a/src/catch2/internal/catch_common.hpp +++ b/src/catch2/internal/catch_common.hpp @@ -20,8 +20,6 @@ #endif #include <iosfwd> -#include <string> -#include <cstdint> // We need a dummy global operator<< so we can bring it into Catch namespace later struct Catch_global_namespace_dummy {}; diff --git a/src/catch2/internal/catch_console_colour.cpp b/src/catch2/internal/catch_console_colour.cpp index 6516018b..a7bce470 100644 --- a/src/catch2/internal/catch_console_colour.cpp +++ b/src/catch2/internal/catch_console_colour.cpp @@ -23,7 +23,7 @@ #include <catch2/internal/catch_debugger.hpp> #include <catch2/internal/catch_windows_h_proxy.hpp> -#include <sstream> +#include <ostream> namespace Catch { namespace { diff --git a/src/catch2/internal/catch_context.hpp b/src/catch2/internal/catch_context.hpp index b52a2267..9f446f24 100644 --- a/src/catch2/internal/catch_context.hpp +++ b/src/catch2/internal/catch_context.hpp @@ -13,7 +13,6 @@ namespace Catch { struct IResultCapture; struct IRunner; struct IConfig; - struct IMutableContext; struct IContext { diff --git a/src/catch2/internal/catch_enum_values_registry.cpp b/src/catch2/internal/catch_enum_values_registry.cpp index 7e7deb87..4e410f93 100644 --- a/src/catch2/internal/catch_enum_values_registry.cpp +++ b/src/catch2/internal/catch_enum_values_registry.cpp @@ -9,7 +9,6 @@ #include <catch2/internal/catch_string_manip.hpp> #include <catch2/internal/catch_stream.hpp> -#include <map> #include <cassert> namespace Catch { diff --git a/src/catch2/internal/catch_enum_values_registry.hpp b/src/catch2/internal/catch_enum_values_registry.hpp index 080af01e..3100136b 100644 --- a/src/catch2/internal/catch_enum_values_registry.hpp +++ b/src/catch2/internal/catch_enum_values_registry.hpp @@ -10,6 +10,7 @@ #include <catch2/interfaces/catch_interfaces_enum_values_registry.hpp> #include <catch2/internal/catch_unique_ptr.hpp> +#include <catch2/internal/catch_stringref.hpp> #include <vector> diff --git a/src/catch2/internal/catch_list.cpp b/src/catch2/internal/catch_list.cpp index 47590ee5..ab3db4df 100644 --- a/src/catch2/internal/catch_list.cpp +++ b/src/catch2/internal/catch_list.cpp @@ -13,18 +13,12 @@ #include <catch2/interfaces/catch_interfaces_testcase.hpp> #include <catch2/internal/catch_context.hpp> +#include <catch2/catch_config.hpp> #include <catch2/internal/catch_stream.hpp> - -#include <catch2/internal/catch_console_colour.hpp> #include <catch2/internal/catch_test_spec_parser.hpp> -#include <catch2/catch_tostring.hpp> #include <catch2/internal/catch_string_manip.hpp> #include <catch2/catch_test_case_info.hpp> -#include <limits> -#include <algorithm> -#include <set> - namespace Catch { namespace { diff --git a/src/catch2/internal/catch_list.hpp b/src/catch2/internal/catch_list.hpp index 638f05b0..0c47d875 100644 --- a/src/catch2/internal/catch_list.hpp +++ b/src/catch2/internal/catch_list.hpp @@ -8,7 +8,6 @@ #ifndef TWOBLUECUBES_CATCH_LIST_H_INCLUDED #define TWOBLUECUBES_CATCH_LIST_H_INCLUDED -#include <catch2/catch_config.hpp> #include <catch2/internal/catch_stringref.hpp> #include <set> @@ -18,6 +17,8 @@ namespace Catch { struct IStreamingReporter; + class Config; + struct ReporterDescription { std::string name, description; diff --git a/src/catch2/internal/catch_run_context.cpp b/src/catch2/internal/catch_run_context.cpp index b85f9ea0..72b7b63d 100644 --- a/src/catch2/internal/catch_run_context.cpp +++ b/src/catch2/internal/catch_run_context.cpp @@ -1,4 +1,5 @@ #include <catch2/interfaces/catch_interfaces_generatortracker.hpp> +#include <catch2/interfaces/catch_interfaces_config.hpp> #include <catch2/internal/catch_run_context.hpp> #include <catch2/internal/catch_compiler_capabilities.hpp> #include <catch2/internal/catch_context.hpp> @@ -8,6 +9,7 @@ #include <catch2/internal/catch_stream.hpp> #include <catch2/catch_timer.hpp> #include <catch2/internal/catch_output_redirect.hpp> +#include <catch2/internal/catch_assertion_handler.hpp> #include <cassert> #include <algorithm> diff --git a/src/catch2/internal/catch_run_context.hpp b/src/catch2/internal/catch_run_context.hpp index d0664e6e..f7d3660b 100644 --- a/src/catch2/internal/catch_run_context.hpp +++ b/src/catch2/internal/catch_run_context.hpp @@ -10,14 +10,13 @@ #include <catch2/interfaces/catch_interfaces_runner.hpp> #include <catch2/interfaces/catch_interfaces_reporter.hpp> -#include <catch2/catch_config.hpp> #include <catch2/internal/catch_test_registry.hpp> #include <catch2/catch_test_case_info.hpp> -#include <catch2/internal/catch_test_macro_impl.hpp> #include <catch2/catch_message.hpp> #include <catch2/catch_totals.hpp> #include <catch2/internal/catch_test_case_tracker.hpp> -#include <catch2/internal/catch_assertion_handler.hpp> +#include <catch2/catch_assertion_info.hpp> +#include <catch2/catch_assertion_result.hpp> #include <string> @@ -25,6 +24,7 @@ namespace Catch { struct IMutableContext; struct IGeneratorTracker; + struct IConfig; /////////////////////////////////////////////////////////////////////////// diff --git a/src/catch2/internal/catch_tag_alias_registry.cpp b/src/catch2/internal/catch_tag_alias_registry.cpp index 7a3d397e..b1241dd1 100644 --- a/src/catch2/internal/catch_tag_alias_registry.cpp +++ b/src/catch2/internal/catch_tag_alias_registry.cpp @@ -12,8 +12,6 @@ #include <catch2/interfaces/catch_interfaces_registry_hub.hpp> #include <catch2/internal/catch_string_manip.hpp> -#include <sstream> - namespace Catch { TagAliasRegistry::~TagAliasRegistry() {} diff --git a/src/catch2/internal/catch_tag_alias_registry.hpp b/src/catch2/internal/catch_tag_alias_registry.hpp index 47cc726b..c76c8c1c 100644 --- a/src/catch2/internal/catch_tag_alias_registry.hpp +++ b/src/catch2/internal/catch_tag_alias_registry.hpp @@ -12,6 +12,7 @@ #include <catch2/catch_tag_alias.hpp> #include <map> +#include <string> namespace Catch { diff --git a/src/catch2/internal/catch_test_case_registry_impl.cpp b/src/catch2/internal/catch_test_case_registry_impl.cpp index b7ebe977..3aca929c 100644 --- a/src/catch2/internal/catch_test_case_registry_impl.cpp +++ b/src/catch2/internal/catch_test_case_registry_impl.cpp @@ -17,9 +17,7 @@ #include <catch2/catch_test_spec.hpp> #include <algorithm> -#include <iterator> -#include <random> -#include <sstream> +#include <set> namespace Catch { diff --git a/src/catch2/internal/catch_test_case_registry_impl.hpp b/src/catch2/internal/catch_test_case_registry_impl.hpp index 01a2c349..4fd692fe 100644 --- a/src/catch2/internal/catch_test_case_registry_impl.hpp +++ b/src/catch2/internal/catch_test_case_registry_impl.hpp @@ -12,8 +12,6 @@ #include <catch2/interfaces/catch_interfaces_config.hpp> #include <vector> -#include <set> -#include <algorithm> namespace Catch { diff --git a/src/catch2/internal/catch_test_case_tracker.cpp b/src/catch2/internal/catch_test_case_tracker.cpp index 4341145d..6636820a 100644 --- a/src/catch2/internal/catch_test_case_tracker.cpp +++ b/src/catch2/internal/catch_test_case_tracker.cpp @@ -13,7 +13,6 @@ #include <algorithm> #include <cassert> #include <memory> -#include <sstream> #if defined(__clang__) # pragma clang diagnostic push diff --git a/src/catch2/internal/catch_test_spec_parser.cpp b/src/catch2/internal/catch_test_spec_parser.cpp index d82cb5e0..38f3f136 100644 --- a/src/catch2/internal/catch_test_spec_parser.cpp +++ b/src/catch2/internal/catch_test_spec_parser.cpp @@ -8,6 +8,7 @@ #include <catch2/internal/catch_test_spec_parser.hpp> #include <catch2/internal/catch_string_manip.hpp> +#include <catch2/interfaces/catch_interfaces_tag_alias_registry.hpp> namespace Catch { diff --git a/src/catch2/internal/catch_test_spec_parser.hpp b/src/catch2/internal/catch_test_spec_parser.hpp index 087a8737..c070ffc1 100644 --- a/src/catch2/internal/catch_test_spec_parser.hpp +++ b/src/catch2/internal/catch_test_spec_parser.hpp @@ -14,10 +14,14 @@ #endif #include <catch2/catch_test_spec.hpp> -#include <catch2/interfaces/catch_interfaces_tag_alias_registry.hpp> + +#include <vector> +#include <string> namespace Catch { + struct ITagAliasRegistry; + class TestSpecParser { enum Mode{ None, Name, QuotedName, Tag, EscapedName }; Mode m_mode = None; |