From a86df51d15da0c55ff7aded9f05d2c23d828eda8 Mon Sep 17 00:00:00 2001
From: Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com>
Date: Wed, 13 Nov 2024 12:54:18 +0100
Subject: other_tools/repo_map,root_maps: Implement IWYU suggestions

---
 src/other_tools/repo_map/TARGETS                |  8 ++++++--
 src/other_tools/repo_map/repos_to_setup_map.cpp | 10 ++++++++--
 src/other_tools/repo_map/repos_to_setup_map.hpp |  2 ++
 3 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'src/other_tools/repo_map')

diff --git a/src/other_tools/repo_map/TARGETS b/src/other_tools/repo_map/TARGETS
index d7d2e2af..264b4dcb 100644
--- a/src/other_tools/repo_map/TARGETS
+++ b/src/other_tools/repo_map/TARGETS
@@ -5,7 +5,9 @@
   , "srcs": ["repos_to_setup_map.cpp"]
   , "deps":
     [ ["@", "gsl", "", "gsl"]
+    , ["@", "json", "", "json"]
     , ["src/buildtool/build_engine/expression", "expression"]
+    , ["src/buildtool/multithreading", "async_map_consumer"]
     , ["src/other_tools/just_mr/progress_reporting", "statistics"]
     , ["src/other_tools/root_maps", "commit_git_map"]
     , ["src/other_tools/root_maps", "content_git_map"]
@@ -17,17 +19,19 @@
   , "stage": ["src", "other_tools", "repo_map"]
   , "private-deps":
     [ ["@", "fmt", "", "fmt"]
+    , ["src/buildtool/build_engine/expression", "expression_ptr_interface"]
     , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/crypto", "hash_info"]
     , ["src/buildtool/file_system", "file_root"]
     , ["src/buildtool/file_system/symlinks_map", "pragma_special"]
-    , ["src/buildtool/logging", "log_level"]
-    , ["src/buildtool/logging", "logging"]
     , ["src/buildtool/multithreading", "task_system"]
+    , ["src/other_tools/just_mr", "utils"]
     , ["src/other_tools/ops_maps", "content_cas_map"]
     , ["src/other_tools/ops_maps", "git_tree_fetch_map"]
     , ["src/other_tools/utils", "parse_archive"]
     , ["src/other_tools/utils", "parse_git_tree"]
+    , ["src/utils/cpp", "expected"]
+    , ["src/utils/cpp", "path"]
     ]
   }
 }
diff --git a/src/other_tools/repo_map/repos_to_setup_map.cpp b/src/other_tools/repo_map/repos_to_setup_map.cpp
index 351c6215..8a714cb2 100644
--- a/src/other_tools/repo_map/repos_to_setup_map.cpp
+++ b/src/other_tools/repo_map/repos_to_setup_map.cpp
@@ -14,21 +14,27 @@
 
 #include "src/other_tools/repo_map/repos_to_setup_map.hpp"
 
+#include <filesystem>
+#include <type_traits>
 #include <unordered_map>
 #include <utility>  // std::move
+#include <vector>
 
 #include "fmt/core.h"
+#include "src/buildtool/build_engine/expression/expression.hpp"
+#include "src/buildtool/build_engine/expression/expression_ptr.hpp"
 #include "src/buildtool/crypto/hash_function.hpp"
 #include "src/buildtool/crypto/hash_info.hpp"
 #include "src/buildtool/file_system/file_root.hpp"
 #include "src/buildtool/file_system/symlinks_map/pragma_special.hpp"
-#include "src/buildtool/logging/log_level.hpp"
-#include "src/buildtool/logging/logger.hpp"
 #include "src/buildtool/multithreading/task_system.hpp"
+#include "src/other_tools/just_mr/utils.hpp"
 #include "src/other_tools/ops_maps/content_cas_map.hpp"
 #include "src/other_tools/ops_maps/git_tree_fetch_map.hpp"
 #include "src/other_tools/utils/parse_archive.hpp"
 #include "src/other_tools/utils/parse_git_tree.hpp"
+#include "src/utils/cpp/expected.hpp"
+#include "src/utils/cpp/path.hpp"
 
 namespace {
 
diff --git a/src/other_tools/repo_map/repos_to_setup_map.hpp b/src/other_tools/repo_map/repos_to_setup_map.hpp
index 0f7f6473..0eb02328 100644
--- a/src/other_tools/repo_map/repos_to_setup_map.hpp
+++ b/src/other_tools/repo_map/repos_to_setup_map.hpp
@@ -22,7 +22,9 @@
 #include <string>
 
 #include "gsl/gsl"
+#include "nlohmann/json.hpp"
 #include "src/buildtool/build_engine/expression/configuration.hpp"
+#include "src/buildtool/multithreading/async_map_consumer.hpp"
 #include "src/other_tools/just_mr/progress_reporting/statistics.hpp"
 #include "src/other_tools/root_maps/commit_git_map.hpp"
 #include "src/other_tools/root_maps/content_git_map.hpp"
-- 
cgit v1.2.3