change includes:

Alexey Pleshakov · Alexey Pleshakov · commit 2ff70ddcddbf · 2021-10-22T15:15:26.000+03:00
loguru.h to loguru.hpp
nlojmann/json.hpp to json.hpp
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
@@ -47,7 +47,7 @@ add_library(loguru ${LOGGER_DIR}/loguru.cpp)
 include_directories(${LOGGER_DIR})
 
 set(JSON_PATH "${UTBOT_DIR}/json")
-include_directories(${JSON_PATH}/include)
+include_directories(${JSON_PATH}/src)
 
 set(TSL_PATH "${UTBOT_DIR}/ordered-map")
 include_directories(${TSL_PATH}/include)
diff --git a/server/main.cpp b/server/main.cpp
@@ -5,7 +5,7 @@
 #include "Server.h"
 #include "utils/CLIUtils.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 #include <cstdlib>
 
diff --git a/server/src/FeaturesFilter.cpp b/server/src/FeaturesFilter.cpp
@@ -8,7 +8,7 @@
 #include "clang-utils/ClangUtils.h"
 #include "exceptions/NoTestGeneratedException.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 static void updateIfNotCompleteType(types::TypeSupport &typeSupport,
                                     bool condition,
diff --git a/server/src/GTestLogger.cpp b/server/src/GTestLogger.cpp
@@ -4,7 +4,7 @@
 
 #include "GTestLogger.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 void GTestLogger::log(std::string_view message) {
     LOG_S(INFO) << message;
diff --git a/server/src/KleeGenerator.cpp b/server/src/KleeGenerator.cpp
@@ -16,7 +16,7 @@
 #include "utils/MakefileUtils.h"
 #include "utils/SanitizerUtils.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 using namespace tests;
 
diff --git a/server/src/KleeRunner.cpp b/server/src/KleeRunner.cpp
@@ -13,7 +13,7 @@
 #include "utils/KleeUtils.h"
 #include "utils/LogUtils.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 #include <unistd.h>
 #include <utility>
diff --git a/server/src/Paths.h b/server/src/Paths.h
@@ -5,7 +5,7 @@
 #ifndef UNITTESTBOT_PATHS_H
 #define UNITTESTBOT_PATHS_H
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 #include "Language.h"
 #include "ProjectContext.h"
diff --git a/server/src/StmtBordersFinder.cpp b/server/src/StmtBordersFinder.cpp
@@ -10,7 +10,7 @@
 #include "utils/CollectionUtils.h"
 #include "utils/CompilationUtils.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 using namespace clang;
 using namespace llvm;
diff --git a/server/src/Tests.h b/server/src/Tests.h
@@ -13,7 +13,7 @@
 
 #include <klee/KTest.h>
 #include <klee/TestCase.h>
-#include <nlohmann/json.hpp>
+#include "json.hpp"
 #include <tsl/ordered_map.h>
 #include <tsl/ordered_set.h>
 
diff --git a/server/src/ThreadSafeContainers.h b/server/src/ThreadSafeContainers.h
@@ -8,7 +8,7 @@
 #include "Paths.h"
 #include "utils/JsonUtils.h"
 
-#include <nlohmann/json.hpp>
+#include "json.hpp"
 
 #include "utils/path/FileSystemPath.h"
 #include <fstream>
diff --git a/server/src/TimeExecStatistics.cpp b/server/src/TimeExecStatistics.cpp
@@ -7,7 +7,7 @@
 #include "utils/CollectionUtils.h"
 #include "utils/StringUtils.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 #include <utility>
 
diff --git a/server/src/building/BaseCommand.cpp b/server/src/building/BaseCommand.cpp
@@ -12,7 +12,7 @@
 #include "utils/CollectionUtils.h"
 #include "utils/StringUtils.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 #include <algorithm>
 #include "utils/path/FileSystemPath.h"
diff --git a/server/src/building/BuildDatabase.cpp b/server/src/building/BuildDatabase.cpp
@@ -13,7 +13,7 @@
 #include "utils/JsonUtils.h"
 #include "utils/StringUtils.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 #include <functional>
 #include <queue>
diff --git a/server/src/building/BuildDatabase.h b/server/src/building/BuildDatabase.h
@@ -10,7 +10,7 @@
 #include "building/LinkCommand.h"
 #include "utils/CollectionUtils.h"
 
-#include <nlohmann/json.hpp>
+#include "json.hpp"
 #include <tsl/ordered_set.h>
 
 #include "utils/path/FileSystemPath.h"
diff --git a/server/src/building/CompileCommand.cpp b/server/src/building/CompileCommand.cpp
@@ -9,7 +9,7 @@
 #include "printers/CCJsonPrinter.h"
 #include "utils/StringUtils.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 #include <algorithm>
 #include <iterator>
diff --git a/server/src/building/IRParser.cpp b/server/src/building/IRParser.cpp
@@ -6,7 +6,7 @@
 
 #include "utils/KleeUtils.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 #include <llvm/BinaryFormat/Magic.h>
 #include <llvm/IR/DebugInfoMetadata.h>
diff --git a/server/src/building/UserProjectConfiguration.cpp b/server/src/building/UserProjectConfiguration.cpp
@@ -14,7 +14,7 @@
 #include "utils/MakefileUtils.h"
 #include "utils/StringUtils.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 Status UserProjectConfiguration::CheckProjectConfiguration(const fs::path &buildDirPath,
                                                            ProjectConfigWriter const &writer) {
diff --git a/server/src/clang-utils/SourceToHeaderRewriter.cpp b/server/src/clang-utils/SourceToHeaderRewriter.cpp
@@ -10,7 +10,7 @@
 #include "utils/Copyright.h"
 #include "utils/LogUtils.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 #include <utility>
 
diff --git a/server/src/commands/Commands.h b/server/src/commands/Commands.h
@@ -7,7 +7,7 @@
 
 #include "Paths.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 #include <protobuf/testgen.grpc.pb.h>
 
diff --git a/server/src/coverage/CoverageAndResultsGenerator.cpp b/server/src/coverage/CoverageAndResultsGenerator.cpp
@@ -8,7 +8,7 @@
 #include "exceptions/CoverageGenerationException.h"
 #include "utils/StringUtils.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 using grpc::Status;
 using grpc::StatusCode;
diff --git a/server/src/coverage/GcovCoverageTool.cpp b/server/src/coverage/GcovCoverageTool.cpp
@@ -17,9 +17,9 @@
 #include "utils/MakefileUtils.h"
 #include "utils/StringUtils.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
-#include <nlohmann/json.hpp>
+#include "json.hpp"
 
 #include "utils/path/FileSystemPath.h"
 #include <utility>
diff --git a/server/src/coverage/LlvmCoverageTool.cpp b/server/src/coverage/LlvmCoverageTool.cpp
@@ -16,7 +16,7 @@
 #include "utils/MakefileUtils.h"
 #include "utils/StringUtils.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 #include "utils/path/FileSystemPath.h"
 
diff --git a/server/src/coverage/TestRunner.cpp b/server/src/coverage/TestRunner.cpp
@@ -10,7 +10,7 @@
 #include "utils/FileSystemUtils.h"
 #include "utils/StringUtils.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 using grpc::ServerWriter;
 using grpc::Status;
diff --git a/server/src/fetchers/ArraySubscriptFetcherMatchCallback.cpp b/server/src/fetchers/ArraySubscriptFetcherMatchCallback.cpp
@@ -8,7 +8,7 @@
 #include "clang-utils/Matchers.h"
 #include "utils/CollectionUtils.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 #include "utils/path/FileSystemPath.h"
 
diff --git a/server/src/fetchers/Fetcher.cpp b/server/src/fetchers/Fetcher.cpp
@@ -14,7 +14,7 @@
 #include "TypeDeclsMatchCallback.h"
 #include "clang-utils/SourceToHeaderMatchCallback.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 #include "utils/path/FileSystemPath.h"
 #include <memory>
diff --git a/server/src/fetchers/FetcherUtils.h b/server/src/fetchers/FetcherUtils.h
@@ -9,7 +9,7 @@
 #include "Tests.h"
 #include "utils/CollectionUtils.h"
 #include "TimeExecStatistics.h"
-#include "loguru.h"
+#include "loguru.hpp"
 
 #include <clang/Tooling/Tooling.h>
 
diff --git a/server/src/fetchers/GlobalVariableUsageMatchCallback.cpp b/server/src/fetchers/GlobalVariableUsageMatchCallback.cpp
@@ -8,7 +8,7 @@
 #include "clang-utils/ClangUtils.h"
 #include "clang-utils/Matchers.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 #include <utility>
 
diff --git a/server/src/fetchers/IncludeFetchSourceFileCallback.cpp b/server/src/fetchers/IncludeFetchSourceFileCallback.cpp
@@ -8,7 +8,7 @@
 #include "utils/ExecUtils.h"
 #include "utils/LogUtils.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 #include <clang/Frontend/CompilerInstance.h>
 
diff --git a/server/src/fetchers/TypeDeclsMatchCallback.h b/server/src/fetchers/TypeDeclsMatchCallback.h
@@ -7,7 +7,7 @@
 
 #include "types/TypesResolver.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 #include <clang/ASTMatchers/ASTMatchFinder.h>
 
diff --git a/server/src/printers/KleePrinter.cpp b/server/src/printers/KleePrinter.cpp
@@ -15,7 +15,7 @@
 #include "visitors/KleeAssumeParamVisitor.h"
 #include "visitors/KleeAssumeReturnValueVisitor.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 #include <unordered_set>
 
diff --git a/server/src/printers/Printer.cpp b/server/src/printers/Printer.cpp
@@ -10,7 +10,7 @@
 #include "utils/Copyright.h"
 #include "visitors/VerboseParameterVisitor.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 namespace printer {
     using StringUtils::stringFormat;
diff --git a/server/src/printers/Printer.h b/server/src/printers/Printer.h
@@ -12,7 +12,7 @@
 #include "stubs/Stubs.h"
 #include "types/Types.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 #include <cstdio>
 #include "utils/path/FileSystemPath.h"
diff --git a/server/src/printers/TestsPrinter.h b/server/src/printers/TestsPrinter.h
@@ -13,7 +13,7 @@
 #include "types/Types.h"
 #include "utils/PrinterUtils.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 #include <cstdio>
 #include "utils/path/FileSystemPath.h"
diff --git a/server/src/streams/coverage/CLICoverageAndResultsWriter.cpp b/server/src/streams/coverage/CLICoverageAndResultsWriter.cpp
@@ -5,7 +5,7 @@
 
 #include "CLICoverageAndResultsWriter.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 #include <fstream>
 #include <utils/FileSystemUtils.h>
diff --git a/server/src/streams/coverage/CoverageAndResultsWriter.h b/server/src/streams/coverage/CoverageAndResultsWriter.h
@@ -10,7 +10,7 @@
 #include "exceptions/ExecutionProcessException.h"
 
 #include <grpcpp/grpcpp.h>
-#include <nlohmann/json.hpp>
+#include "json.hpp"
 #include <protobuf/testgen.grpc.pb.h>
 
 
diff --git a/server/src/streams/coverage/ServerCoverageAndResultsWriter.cpp b/server/src/streams/coverage/ServerCoverageAndResultsWriter.cpp
@@ -7,7 +7,7 @@
 
 #include "../WriterUtils.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 ServerCoverageAndResultsWriter::ServerCoverageAndResultsWriter(
     grpc::ServerWriter<testsgen::CoverageAndResultsResponse> *writer)
diff --git a/server/src/streams/stubs/CLIStubsWriter.cpp b/server/src/streams/stubs/CLIStubsWriter.cpp
@@ -5,7 +5,7 @@
 #include "CLIStubsWriter.h"
 
 #include <utils/FileSystemUtils.h>
-#include "loguru.h"
+#include "loguru.hpp"
 
 void CLIStubsWriter::writeResponse(const vector<Stubs> &synchronizedStubs,
                                    const fs::path &testDirPath) {
diff --git a/server/src/streams/stubs/ServerStubsWriter.cpp b/server/src/streams/stubs/ServerStubsWriter.cpp
@@ -4,7 +4,7 @@
 
 #include "ServerStubsWriter.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 void ServerStubsWriter::writeResponse(const vector<Stubs> &synchronizedStubs,
                                       const fs::path &testDirPath) {
diff --git a/server/src/streams/stubs/StubsWriter.cpp b/server/src/streams/stubs/StubsWriter.cpp
@@ -8,7 +8,7 @@
 #include "stubs/StubGen.h"
 #include "utils/FileSystemUtils.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 StubsWriter::StubsWriter(grpc::ServerWriter<testsgen::StubsResponse> *writer) : ServerWriter(writer) {
 }
diff --git a/server/src/streams/tests/CLITestsWriter.cpp b/server/src/streams/tests/CLITestsWriter.cpp
@@ -4,7 +4,7 @@
 
 #include "CLITestsWriter.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 #include <utils/FileSystemUtils.h>
 
diff --git a/server/src/streams/tests/ServerTestsWriter.h b/server/src/streams/tests/ServerTestsWriter.h
@@ -9,7 +9,7 @@
 #include "TestsWriter.h"
 #include "streams/IStreamWriter.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 #include <utils/FileSystemUtils.h>
 
diff --git a/server/src/streams/tests/TestsWriter.cpp b/server/src/streams/tests/TestsWriter.cpp
@@ -6,7 +6,7 @@
 
 #include "utils/FileSystemUtils.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 
 TestsWriter::TestsWriter(grpc::ServerWriter<testsgen::TestsResponse> *writer): ServerWriter(writer) {}
diff --git a/server/src/stubs/StubSourcesFinder.cpp b/server/src/stubs/StubSourcesFinder.cpp
@@ -4,7 +4,7 @@
 
 #include "StubSourcesFinder.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 
 StubSourcesFinder::StubSourcesFinder(std::shared_ptr<BuildDatabase> buildDatabase)
     : buildDatabase(std::move(buildDatabase)) {
diff --git a/server/src/tasks/BaseForkTask.h b/server/src/tasks/BaseForkTask.h
@@ -6,7 +6,7 @@
 #define UNITTESTBOT_BASEFORKTASK_H
 #include "utils/LogUtils.h"
 
-#include "loguru.h"
+#include "loguru.hpp"
 #include <protobuf/testgen.grpc.pb.h>
 #include <run_klee/run_klee.h>
 
diff --git a/server/src/types/Types.cpp b/server/src/types/Types.cpp
diff --git a/server/src/utils/ArgumentsUtils.cpp b/server/src/utils/ArgumentsUtils.cpp
diff --git a/server/src/utils/CLIUtils.cpp b/server/src/utils/CLIUtils.cpp
diff --git a/server/src/utils/CLIUtils.h b/server/src/utils/CLIUtils.h
diff --git a/server/src/utils/CPipe.cpp b/server/src/utils/CPipe.cpp
diff --git a/server/src/utils/CompilationUtils.cpp b/server/src/utils/CompilationUtils.cpp
diff --git a/server/src/utils/CompilationUtils.h b/server/src/utils/CompilationUtils.h
diff --git a/server/src/utils/JsonUtils.cpp b/server/src/utils/JsonUtils.cpp
diff --git a/server/src/utils/JsonUtils.h b/server/src/utils/JsonUtils.h
diff --git a/server/src/utils/KleeUtils.cpp b/server/src/utils/KleeUtils.cpp
diff --git a/server/src/utils/LogUtils.cpp b/server/src/utils/LogUtils.cpp
diff --git a/server/src/utils/MakefileUtils.cpp b/server/src/utils/MakefileUtils.cpp
diff --git a/server/src/utils/PrinterUtils.cpp b/server/src/utils/PrinterUtils.cpp
diff --git a/server/src/utils/ServerUtils.cpp b/server/src/utils/ServerUtils.cpp
diff --git a/server/test/framework/main.cpp b/server/test/framework/main.cpp
