Formatting, and prune unused #includes

src/dds/build.cpp

@@ -1,36 +1,16 @@
 #include "./build.hpp"
 
-#include <dds/build/plan/compile_file.hpp>
 #include <dds/compdb.hpp>
 #include <dds/logging.hpp>
-#include <dds/proc.hpp>
-#include <dds/source.hpp>
-#include <dds/toolchain/toolchain.hpp>
 #include <dds/usage_reqs.hpp>
 #include <dds/util/algo.hpp>
-#include <dds/util/string.hpp>
 #include <libman/index.hpp>
 #include <libman/parse.hpp>
 
-#include <range/v3/range/conversion.hpp>
-#include <range/v3/view/drop.hpp>
-#include <range/v3/view/filter.hpp>
-#include <range/v3/view/transform.hpp>
-
-#include <algorithm>
-#include <chrono>
-#include <iomanip>
-#include <iostream>
-#include <mutex>
-#include <sstream>
 #include <stdexcept>
-#include <thread>
 
 using namespace dds;
 
-using namespace ranges;
-using namespace ranges::views;
-
 namespace {
 
 struct archive_failure : std::runtime_error {

src/dds/build.hpp

@@ -2,9 +2,6 @@
 
 #include <dds/build/params.hpp>
 #include <dds/package_manifest.hpp>
-#include <dds/util/fs.hpp>
-
-#include <optional>
 
 namespace dds {
 

src/dds/build/archive.cpp

@@ -1 +0,0 @@
-#include "./archive.hpp"

src/dds/build/archive.hpp

@@ -1,17 +0,0 @@
-#pragma once
-
-#include <dds/toolchain/toolchain.hpp>
-#include <dds/util/fs.hpp>
-
-#include <vector>
-
-namespace dds {
-
-struct archive_rules {
-    std::vector<fs::path> objects;
-    fs::path              out;
-
-    void create_archive(const toolchain& tc) const;
-};
-
-}  // namespace dds

src/dds/build/executable.hpp

@@ -1,14 +0,0 @@
-#pragma once
-
-#include <dds/util/fs.hpp>
-
-#include <vector>
-
-namespace dds {
-
-class link_executable_rules {
-    std::vector<fs::path> inputs;
-    fs::path              output;
-};
-
-}  // namespace dds

src/dds/build/plan/compile_file.cpp

@@ -6,9 +6,7 @@
 
 #include <spdlog/spdlog.h>
 
-#include <atomic>
-#include <mutex>
-#include <thread>
+#include <string>
 #include <vector>
 
 using namespace dds;

src/dds/build/plan/exe.cpp

@@ -6,7 +6,6 @@
 #include <spdlog/spdlog.h>
 
 #include <algorithm>
-#include <cassert>
 #include <chrono>
 
 using namespace dds;

src/dds/build/plan/exe.hpp

@@ -3,8 +3,7 @@
 #include <dds/build/plan/compile_file.hpp>
 #include <dds/util/fs.hpp>
 
-#include <set>
-#include <tuple>
+#include <string>
 #include <vector>
 
 namespace dds {

src/dds/build/plan/full.cpp

@@ -1,19 +1,14 @@
 #include "./full.hpp"
 
 #include <dds/build/iter_compilations.hpp>
-#include <dds/proc.hpp>
 
-#include <range/v3/action/join.hpp>
 #include <range/v3/view/concat.hpp>
 #include <range/v3/view/filter.hpp>
 #include <range/v3/view/join.hpp>
-#include <range/v3/view/repeat_n.hpp>
 #include <range/v3/view/transform.hpp>
-#include <range/v3/view/zip.hpp>
 
 #include <spdlog/spdlog.h>
 
-#include <chrono>
 #include <mutex>
 #include <thread>
 
@@ -96,7 +91,9 @@ void build_plan::archive_all(const build_env& env, int njobs) const {
 }
 
 void build_plan::link_all(const build_env& env, int njobs) const {
-    std::vector<std::pair<std::reference_wrapper<const library_plan>, std::reference_wrapper<const link_executable_plan>>> executables;
+    std::vector<std::pair<std::reference_wrapper<const library_plan>,
+                          std::reference_wrapper<const link_executable_plan>>>
+        executables;
 
     for (auto&& lib : iter_libraries(*this)) {
         for (auto&& exe : lib.executables()) {

src/dds/build/plan/full.hpp

@@ -1,12 +1,7 @@
 #pragma once
 
-#include <dds/build/params.hpp>
-#include <dds/build/plan/archive.hpp>
-#include <dds/build/plan/compile_file.hpp>
 #include <dds/build/plan/exe.hpp>
-#include <dds/build/plan/library.hpp>
 #include <dds/build/plan/package.hpp>
-#include <dds/library.hpp>
 
 namespace dds {
 

src/dds/build/plan/library.cpp

@@ -4,7 +4,6 @@
 
 #include <range/v3/view/concat.hpp>
 #include <range/v3/view/filter.hpp>
-#include <spdlog/spdlog.h>
 
 using namespace dds;
 

src/dds/build/plan/library.hpp

@@ -6,7 +6,6 @@
 #include <dds/usage_reqs.hpp>
 #include <dds/util/fs.hpp>
 
-#include <map>
 #include <optional>
 #include <string>
 #include <vector>

src/dds/build/plan/package.hpp

@@ -2,8 +2,8 @@
 
 #include <dds/build/plan/library.hpp>
 
-#include <map>
 #include <string>
+#include <vector>
 
 namespace dds {
 

src/dds/compdb.cpp

@@ -6,9 +6,6 @@
 
 #include <nlohmann/json.hpp>
 
-#include <range/v3/view/join.hpp>
-#include <range/v3/view/transform.hpp>
-
 using namespace dds;
 
 void dds::generate_compdb(const build_plan& plan, build_env_ref env) {

src/dds/dds.main.cpp

@@ -10,8 +10,6 @@
 #include <range/v3/view/group_by.hpp>
 #include <range/v3/view/transform.hpp>
 
-#include <libman/parse.hpp>
-
 #include <args.hxx>
 
 #include <filesystem>
@@ -456,9 +454,9 @@ struct cli_deps {
 */
 
 int main(int argc, char** argv) {
-    #if DDS_DEBUG
+#if DDS_DEBUG
     spdlog::set_level(spdlog::level::debug);
-    #endif
+#endif
     spdlog::set_pattern("[%H:%M:%S] [%^%-5l%$] %v");
     args::ArgumentParser parser("DDS - The drop-dead-simple library manager");
 

src/dds/deps.cpp

@@ -3,7 +3,6 @@
 #include <dds/repo/repo.hpp>
 #include <dds/sdist.hpp>
 #include <dds/usage_reqs.hpp>
-#include <dds/util/algo.hpp>
 #include <dds/util/string.hpp>
 #include <libman/index.hpp>
 #include <libman/parse.hpp>
@@ -14,6 +13,7 @@
 
 #include <cctype>
 #include <map>
+#include <set>
 
 using namespace dds;
 

src/dds/library.hpp

@@ -5,7 +5,6 @@
 #include <dds/library_manifest.hpp>
 #include <dds/source.hpp>
 
-#include <optional>
 #include <string>
 
 namespace dds {

src/dds/proc.common.cpp

@@ -3,7 +3,6 @@
 #include <dds/util/string.hpp>
 
 #include <algorithm>
-#include <array>
 #include <cctype>
 
 using namespace dds;

src/dds/repo/repo.cpp

@@ -6,10 +6,7 @@
 
 #include <spdlog/spdlog.h>
 
-#include <range/v3/action/join.hpp>
-#include <range/v3/range/conversion.hpp>
 #include <range/v3/view/filter.hpp>
-#include <range/v3/view/join.hpp>
 #include <range/v3/view/transform.hpp>
 
 using namespace dds;

src/dds/repo/repo.hpp

@@ -3,7 +3,6 @@
 #include <dds/util/flock.hpp>
 #include <dds/util/fs.hpp>
 
-#include <cassert>
 #include <functional>
 #include <optional>
 #include <shared_mutex>

src/dds/sdist.cpp

@@ -9,7 +9,6 @@
 #include <browns/output.hpp>
 #include <neo/buffer.hpp>
 
-#include <range/v3/algorithm/for_each.hpp>
 #include <range/v3/algorithm/sort.hpp>
 #include <range/v3/view/filter.hpp>
 

src/dds/source.cpp

@@ -2,8 +2,6 @@
 
 #include <dds/util/string.hpp>
 
-#include <spdlog/spdlog.h>
-
 #include <algorithm>
 #include <optional>
 #include <vector>

src/dds/source.hpp

@@ -3,7 +3,6 @@
 #include <dds/util/fs.hpp>
 
 #include <optional>
-#include <vector>
 
 namespace dds {
 

src/dds/toolchain/toolchain.hpp

@@ -4,6 +4,7 @@
 
 #include <optional>
 #include <string>
+#include <string_view>
 #include <vector>
 
 namespace dds {

src/libman/parse.hpp

@@ -271,7 +271,7 @@ template <typename T>
 void validate_reader(T&&, std::string_view, ...) {}
 
 template <typename... Items>
-auto read(std::string_view context[[maybe_unused]], const pair_list& pairs, Items... is) {
+auto read(std::string_view context [[maybe_unused]], const pair_list& pairs, Items... is) {
     std::vector<pair> bad_pairs;
     for (auto [key, value] : pairs.items()) {
         auto did_read = (is(context, key, value) || ...);