re-ran on libfetchers with the iwyu mapping file

Author: fzakaria

src/libfetchers/attrs.cc

@@ -1,8 +1,5 @@
 #include <nlohmann/json.hpp>
-#include <nlohmann/detail/iterators/iter_impl.hpp>
-#include <nlohmann/detail/iterators/iteration_proxy.hpp>
 #include <stdint.h>
-#include <nlohmann/json_fwd.hpp>
 #include <utility>
 #include <map>
 #include <optional>

src/libfetchers/cache.cc

@@ -1,6 +1,5 @@
 #include <nlohmann/json.hpp>
 #include <time.h>
-#include <nlohmann/json_fwd.hpp>
 #include <filesystem>
 #include <map>
 #include <memory>

src/libfetchers/fetchers.cc

@@ -2,7 +2,6 @@
 #include <assert.h>
 #include <stdint.h>
 #include <time.h>
-#include <nlohmann/json_fwd.hpp>
 #include <vector>
 #include <filesystem>
 #include <map>

src/libfetchers/git-lfs-fetch.cc

@@ -1,17 +1,9 @@
-#include <git2/attr.h>
-#include <git2/config.h>
-#include <git2/errors.h>
-#include <git2/remote.h>
 #include <nlohmann/json.hpp>
 #include <assert.h>
 #include <ctype.h>
-#include <git2/repository.h>
-#include <nlohmann/detail/json_ref.hpp>
-#include <git2/oid.h>
-#include <git2/types.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <nlohmann/json_fwd.hpp>
+#include <git2.h>
 #include <algorithm>
 #include <filesystem>
 #include <list>
@@ -24,7 +16,6 @@
 #include <string>
 #include <vector>
 #include <format>
-#include <map>
 
 #include "nix/fetchers/git-lfs-fetch.hh"
 #include "nix/fetchers/git-utils.hh"

src/libfetchers/git-utils.cc

@@ -1,31 +1,11 @@
-#include <git2/attr.h>
-#include <git2/blob.h>
-#include <git2/commit.h>
-#include <git2/config.h>
-#include <git2/describe.h>
-#include <git2/errors.h>
-#include <git2/global.h>
-#include <git2/indexer.h>
-#include <git2/object.h>
-#include <git2/odb.h>
-#include <git2/refs.h>
-#include <git2/remote.h>
-#include <git2/repository.h>
-#include <git2/revparse.h>
-#include <git2/status.h>
-#include <git2/submodule.h>
 #include <git2/sys/mempack.h>
-#include <git2/tree.h>
 #include <boost/unordered/unordered_flat_map.hpp>
 #include <boost/unordered/unordered_flat_set.hpp>
 #include <assert.h>
-#include <git2/buffer.h>
-#include <git2/oid.h>
-#include <git2/pack.h>
-#include <git2/types.h>
 #include <boost/core/pointer_traits.hpp>
 #include <boost/unordered/detail/foa/table.hpp>
 #include <stdint.h>
+#include <git2.h>
 #include <iostream>
 #include <queue>
 #include <regex>

src/libfetchers/git.cc

@@ -4,7 +4,6 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <nlohmann/json.hpp>
-#include <nlohmann/json_fwd.hpp>
 #include <filesystem>
 #include <map>
 #include <memory>

src/libfetchers/github.cc

@@ -2,9 +2,7 @@
 #include <assert.h>
 #include <stdint.h>
 #include <time.h>
-#include <nlohmann/json_fwd.hpp>
 #include <optional>
-#include <cmath>
 #include <functional>
 #include <iterator>
 #include <map>

src/libfetchers/registry.cc

@@ -1,5 +1,4 @@
 #include <nlohmann/json.hpp>
-#include <nlohmann/json_fwd.hpp>
 #include <algorithm>
 #include <filesystem>
 #include <map>