diff options
Diffstat (limited to 'src')
26 files changed, 35 insertions, 57 deletions
diff --git a/src/buildtool/auth/authentication.hpp b/src/buildtool/auth/authentication.hpp index 14bc02bb..d6ce7cfe 100644 --- a/src/buildtool/auth/authentication.hpp +++ b/src/buildtool/auth/authentication.hpp @@ -22,9 +22,8 @@ #include <string> #include <utility> +#include "gsl/gsl" #include "src/buildtool/logging/logger.hpp" - -#include <gsl/gsl> enum class AuthMethod : std::uint8_t { kNONE, kTLS }; class Auth { diff --git a/src/buildtool/build_engine/base_maps/expression_function.hpp b/src/buildtool/build_engine/base_maps/expression_function.hpp index 91b303a5..52bd53c2 100644 --- a/src/buildtool/build_engine/base_maps/expression_function.hpp +++ b/src/buildtool/build_engine/base_maps/expression_function.hpp @@ -20,8 +20,7 @@ #include <unordered_map> #include <vector> -#include <fmt/core.h> - +#include "fmt/core.h" #include "gsl/gsl" #include "src/buildtool/build_engine/expression/configuration.hpp" #include "src/buildtool/build_engine/expression/evaluator.hpp" diff --git a/src/buildtool/build_engine/expression/target_result.hpp b/src/buildtool/build_engine/expression/target_result.hpp index 587b794a..02ef4faa 100644 --- a/src/buildtool/build_engine/expression/target_result.hpp +++ b/src/buildtool/build_engine/expression/target_result.hpp @@ -17,8 +17,7 @@ #include <unordered_map> -#include <nlohmann/json.hpp> - +#include "nlohmann/json.hpp" #include "src/buildtool/build_engine/expression/expression_ptr.hpp" #include "src/buildtool/common/artifact_description.hpp" #include "src/utils/cpp/hash_combine.hpp" diff --git a/src/buildtool/build_engine/target_map/built_in_rules.cpp b/src/buildtool/build_engine/target_map/built_in_rules.cpp index fca1eaaa..6732fd1e 100644 --- a/src/buildtool/build_engine/target_map/built_in_rules.cpp +++ b/src/buildtool/build_engine/target_map/built_in_rules.cpp @@ -24,9 +24,8 @@ #include <unordered_map> #include <unordered_set> -#include <fmt/core.h> -#include <nlohmann/json.hpp> - +#include "fmt/core.h" +#include "nlohmann/json.hpp" #include "src/buildtool/build_engine/base_maps/field_reader.hpp" #include "src/buildtool/build_engine/expression/expression.hpp" #include "src/buildtool/build_engine/expression/expression_ptr.hpp" diff --git a/src/buildtool/common/remote/remote_common.hpp b/src/buildtool/common/remote/remote_common.hpp index e8ce2ed7..ddbd16fb 100644 --- a/src/buildtool/common/remote/remote_common.hpp +++ b/src/buildtool/common/remote/remote_common.hpp @@ -19,9 +19,8 @@ #include <sstream> #include <string> -#include <fmt/core.h> -#include <nlohmann/json.hpp> - +#include "fmt/core.h" +#include "nlohmann/json.hpp" #include "src/buildtool/common/remote/port.hpp" struct ServerAddress { diff --git a/src/buildtool/compatibility/native_support.hpp b/src/buildtool/compatibility/native_support.hpp index 449117c9..b0fee1ea 100644 --- a/src/buildtool/compatibility/native_support.hpp +++ b/src/buildtool/compatibility/native_support.hpp @@ -17,11 +17,10 @@ #include <string> +#include "gsl/gsl" #include "src/buildtool/compatibility/compatibility.hpp" #include "src/utils/cpp/gsl.hpp" -#include <gsl/gsl> - /// \brief Helper functions to support the native remote-execution protocol. class NativeSupport { static constexpr std::size_t kTagLength = 2; diff --git a/src/buildtool/crypto/hash_function.hpp b/src/buildtool/crypto/hash_function.hpp index fa141ed2..f2dc618a 100644 --- a/src/buildtool/crypto/hash_function.hpp +++ b/src/buildtool/crypto/hash_function.hpp @@ -22,10 +22,9 @@ #include <string> #include <utility> +#include "gsl/gsl" #include "src/buildtool/crypto/hasher.hpp" -#include <gsl/gsl> - /// \brief Hash function used for the entire buildtool. class HashFunction { public: diff --git a/src/buildtool/execution_api/execution_service/ac_server.cpp b/src/buildtool/execution_api/execution_service/ac_server.cpp index a83ba8a9..84a75d18 100644 --- a/src/buildtool/execution_api/execution_service/ac_server.cpp +++ b/src/buildtool/execution_api/execution_service/ac_server.cpp @@ -14,8 +14,7 @@ #include "src/buildtool/execution_api/execution_service/ac_server.hpp" -#include <fmt/core.h> - +#include "fmt/core.h" #include "src/buildtool/storage/garbage_collector.hpp" #include "src/utils/cpp/verify_hash.hpp" diff --git a/src/buildtool/execution_api/local/config.hpp b/src/buildtool/execution_api/local/config.hpp index 9257b758..10d36a79 100644 --- a/src/buildtool/execution_api/local/config.hpp +++ b/src/buildtool/execution_api/local/config.hpp @@ -20,16 +20,14 @@ #include <string> #include <vector> -#include <nlohmann/json.hpp> - +#include "gsl/gsl" +#include "nlohmann/json.hpp" #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/object_type.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" -#include <gsl/gsl> - /// \brief Store global build system configuration. class LocalExecutionConfig { struct ConfigData { diff --git a/src/buildtool/execution_api/remote/config.cpp b/src/buildtool/execution_api/remote/config.cpp index 4403730e..b45f7d43 100644 --- a/src/buildtool/execution_api/remote/config.cpp +++ b/src/buildtool/execution_api/remote/config.cpp @@ -17,7 +17,7 @@ #include <exception> #include <fstream> -#include <nlohmann/json.hpp> +#include "nlohmann/json.hpp" [[nodiscard]] auto RemoteExecutionConfig::SetRemoteExecutionDispatch( const std::filesystem::path& filename) noexcept -> bool { diff --git a/src/buildtool/file_system/object_type.hpp b/src/buildtool/file_system/object_type.hpp index ae307513..59986042 100644 --- a/src/buildtool/file_system/object_type.hpp +++ b/src/buildtool/file_system/object_type.hpp @@ -16,7 +16,7 @@ #define INCLUDED_SRC_BUILDTOOL_FILE_SYSTEM_OBJECT_TYPE_HPP #include <cstdint> -#include <gsl/gsl> +#include "gsl/gsl" enum class ObjectType : std::int8_t { File, diff --git a/src/buildtool/logging/log_level.hpp b/src/buildtool/logging/log_level.hpp index bbc599b9..65b7b7c2 100644 --- a/src/buildtool/logging/log_level.hpp +++ b/src/buildtool/logging/log_level.hpp @@ -20,7 +20,7 @@ #include <string> #include <type_traits> -#include <gsl/gsl> +#include "gsl/gsl" enum class LogLevel { Error, ///< Error messages, fatal errors diff --git a/src/buildtool/main/cli.cpp b/src/buildtool/main/cli.cpp index 5e5dc651..475b7256 100644 --- a/src/buildtool/main/cli.cpp +++ b/src/buildtool/main/cli.cpp @@ -14,10 +14,9 @@ #include "src/buildtool/main/cli.hpp" +#include "gsl/gsl" #include "src/buildtool/main/exit_codes.hpp" -#include <gsl/gsl> - namespace { /// \brief Setup arguments for sub command "just describe". diff --git a/src/buildtool/main/describe.cpp b/src/buildtool/main/describe.cpp index fcec015b..07a8febc 100644 --- a/src/buildtool/main/describe.cpp +++ b/src/buildtool/main/describe.cpp @@ -16,8 +16,7 @@ #include <iostream> -#include <nlohmann/json.hpp> - +#include "nlohmann/json.hpp" #include "src/buildtool/build_engine/base_maps/rule_map.hpp" #include "src/buildtool/build_engine/base_maps/targets_file_map.hpp" #include "src/buildtool/build_engine/target_map/target_map.hpp" diff --git a/src/buildtool/main/install_cas.hpp b/src/buildtool/main/install_cas.hpp index f577866d..fe2742b7 100644 --- a/src/buildtool/main/install_cas.hpp +++ b/src/buildtool/main/install_cas.hpp @@ -17,10 +17,9 @@ #include <string> +#include "gsl/gsl" #include "src/buildtool/common/artifact.hpp" #include "src/buildtool/common/cli.hpp" - -#include <gsl/gsl> #ifndef BOOTSTRAP_BUILD_TOOL #include "src/buildtool/execution_api/common/execution_api.hpp" #endif diff --git a/src/buildtool/serve_api/remote/configuration_client.cpp b/src/buildtool/serve_api/remote/configuration_client.cpp index f0615951..b4f74230 100644 --- a/src/buildtool/serve_api/remote/configuration_client.cpp +++ b/src/buildtool/serve_api/remote/configuration_client.cpp @@ -14,8 +14,7 @@ #include "src/buildtool/serve_api/remote/configuration_client.hpp" -#include <nlohmann/json.hpp> - +#include "nlohmann/json.hpp" #include "src/buildtool/execution_api/remote/config.hpp" auto ConfigurationClient::CheckServeRemoteExecution() -> bool { diff --git a/src/buildtool/serve_api/remote/target_client.cpp b/src/buildtool/serve_api/remote/target_client.cpp index bb30907d..8571910d 100644 --- a/src/buildtool/serve_api/remote/target_client.cpp +++ b/src/buildtool/serve_api/remote/target_client.cpp @@ -16,8 +16,7 @@ #include <utility> -#include <nlohmann/json.hpp> - +#include "nlohmann/json.hpp" #include "src/buildtool/common/bazel_types.hpp" #include "src/buildtool/common/remote/client_common.hpp" diff --git a/src/buildtool/serve_api/serve_service/target.cpp b/src/buildtool/serve_api/serve_service/target.cpp index 364f0420..000de1c4 100644 --- a/src/buildtool/serve_api/serve_service/target.cpp +++ b/src/buildtool/serve_api/serve_service/target.cpp @@ -17,10 +17,9 @@ #include <string> #include <utility> -#include <fmt/core.h> -#include <fmt/format.h> -#include <nlohmann/json.hpp> - +#include "fmt/core.h" +#include "fmt/format.h" +#include "nlohmann/json.hpp" #include "src/buildtool/build_engine/expression/expression.hpp" #include "src/buildtool/build_engine/expression/expression_ptr.hpp" #include "src/buildtool/common/artifact.hpp" diff --git a/src/buildtool/serve_api/serve_service/target.hpp b/src/buildtool/serve_api/serve_service/target.hpp index e1176b86..e5422c76 100644 --- a/src/buildtool/serve_api/serve_service/target.hpp +++ b/src/buildtool/serve_api/serve_service/target.hpp @@ -19,6 +19,7 @@ #include <memory> #include <optional> +#include "gsl/gsl" #include "justbuild/just_serve/just_serve.grpc.pb.h" #include "src/buildtool/common/remote/remote_common.hpp" #include "src/buildtool/execution_api/common/create_execution_api.hpp" diff --git a/src/buildtool/storage/config.hpp b/src/buildtool/storage/config.hpp index 884dae48..069daed2 100644 --- a/src/buildtool/storage/config.hpp +++ b/src/buildtool/storage/config.hpp @@ -28,8 +28,8 @@ #include <string> #include <vector> -#include <nlohmann/json.hpp> - +#include "gsl/gsl" +#include "nlohmann/json.hpp" #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/compatibility/compatibility.hpp" #include "src/buildtool/execution_api/remote/config.hpp" @@ -39,8 +39,6 @@ #include "src/buildtool/logging/logger.hpp" #include "src/utils/cpp/gsl.hpp" -#include <gsl/gsl> - /// \brief Global storage configuration. class StorageConfig { struct ConfigData { diff --git a/src/buildtool/storage/garbage_collector.cpp b/src/buildtool/storage/garbage_collector.cpp index 3e486672..bd156f0c 100644 --- a/src/buildtool/storage/garbage_collector.cpp +++ b/src/buildtool/storage/garbage_collector.cpp @@ -18,8 +18,7 @@ #include <vector> -#include <nlohmann/json.hpp> - +#include "nlohmann/json.hpp" #include "src/buildtool/common/artifact.hpp" #include "src/buildtool/common/bazel_types.hpp" #include "src/buildtool/compatibility/compatibility.hpp" diff --git a/src/buildtool/storage/target_cache.hpp b/src/buildtool/storage/target_cache.hpp index c7f0ae53..f263fdf9 100644 --- a/src/buildtool/storage/target_cache.hpp +++ b/src/buildtool/storage/target_cache.hpp @@ -20,8 +20,8 @@ #include <optional> #include <utility> -#include <nlohmann/json.hpp> - +#include "gsl/gsl" +#include "nlohmann/json.hpp" #include "src/buildtool/common/artifact.hpp" #include "src/buildtool/file_system/file_storage.hpp" #include "src/buildtool/file_system/object_type.hpp" @@ -33,8 +33,6 @@ #include "src/buildtool/storage/target_cache_key.hpp" #include "src/utils/cpp/gsl.hpp" -#include <gsl/gsl> - /// \brief The high-level target cache for storing export target's data. /// Supports global uplinking across all generations using the garbage /// collector. The uplink is automatically performed for every entry that is diff --git a/src/buildtool/storage/target_cache_entry.hpp b/src/buildtool/storage/target_cache_entry.hpp index dadbb080..c83d7929 100644 --- a/src/buildtool/storage/target_cache_entry.hpp +++ b/src/buildtool/storage/target_cache_entry.hpp @@ -20,15 +20,13 @@ #include <utility> #include <vector> -#include <nlohmann/json.hpp> - +#include "gsl/gsl" +#include "nlohmann/json.hpp" #include "src/buildtool/build_engine/analysed_target/analysed_target.hpp" #include "src/buildtool/build_engine/expression/target_result.hpp" #include "src/buildtool/common/artifact.hpp" #include "src/buildtool/common/artifact_description.hpp" -#include <gsl/gsl> - // Entry for target cache. Created from target, contains TargetResult. class TargetCacheEntry { public: diff --git a/src/buildtool/storage/target_cache_key.cpp b/src/buildtool/storage/target_cache_key.cpp index 7d300338..3cea7152 100644 --- a/src/buildtool/storage/target_cache_key.cpp +++ b/src/buildtool/storage/target_cache_key.cpp @@ -16,8 +16,7 @@ #include <exception> -#include <nlohmann/json.hpp> - +#include "nlohmann/json.hpp" #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/file_system/object_type.hpp" #include "src/buildtool/logging/log_level.hpp" diff --git a/src/utils/cpp/gsl.hpp b/src/utils/cpp/gsl.hpp index 882df29b..97e0afe7 100644 --- a/src/utils/cpp/gsl.hpp +++ b/src/utils/cpp/gsl.hpp @@ -15,7 +15,7 @@ #ifndef INCLUDED_SRC_UTILS_CPP_GSL_HPP #define INCLUDED_SRC_UTILS_CPP_GSL_HPP -#include <gsl/gsl> +#include "gsl/gsl" // implement EnsuresAudit/ExpectsAudit (from gsl-lite) only run in debug mode #ifdef NDEBUG diff --git a/src/utils/cpp/verify_hash.hpp b/src/utils/cpp/verify_hash.hpp index ab2a4b45..4ec3a30b 100644 --- a/src/utils/cpp/verify_hash.hpp +++ b/src/utils/cpp/verify_hash.hpp @@ -19,7 +19,8 @@ #include <optional> #include <string> -#include <fmt/core.h> +#include "fmt/core.h" + /// \brief Check if the passed string \p s is a hash. /// This function is mainly used to check that the hash of a Digest received /// over the wire is a real hash, to prevent a malicious attack. |