chore: move try_find to Manifest.cc

lib/Manifest.cc

@@ -4,6 +4,7 @@
 #include "Builder/Compiler.hpp"
 #include "Rustify/Result.hpp"
 #include "Semver.hpp"
+#include "TermColor.hpp"
 #include "VersionReq.hpp"
 
 #include <cctype>
@@ -23,6 +24,43 @@
 #include <utility>
 #include <vector>
 
+namespace toml {
+
+template <typename T, typename... U>
+// NOLINTNEXTLINE(readability-identifier-naming,cppcoreguidelines-macro-usage)
+inline Result<T> try_find(const toml::value& v, const U&... u) noexcept {
+  using std::string_view_literals::operator""sv;
+
+  if (cabin::shouldColorStderr()) {
+    color::enable();
+  } else {
+    color::disable();
+  }
+
+  try {
+    return Ok(toml::find<T>(v, u...));
+  } catch (const std::exception& e) {
+    std::string what = e.what();
+
+    static constexpr std::size_t errorPrefixSize = "[error] "sv.size();
+    static constexpr std::size_t colorErrorPrefixSize =
+        "\033[31m\033[01m[error]\033[00m "sv.size();
+
+    if (cabin::shouldColorStderr()) {
+      what = what.substr(colorErrorPrefixSize);
+    } else {
+      what = what.substr(errorPrefixSize);
+    }
+
+    if (what.back() == '\n') {
+      what.pop_back(); // remove the last '\n' since Diag::error adds one.
+    }
+    return Err(anyhow::anyhow(what));
+  }
+}
+
+} // namespace toml
+
 namespace cabin {
 
 static const std::unordered_set<char> ALLOWED_CHARS = {
@@ -637,7 +675,6 @@ Result<void> validatePackageName(const std::string_view name) noexcept {
 #ifdef CABIN_TEST
 
 #  include "Rustify/Tests.hpp"
-#  include "TermColor.hpp"
 
 #  include <climits>
 #  include <fmt/ranges.h>

rustify/include/Rustify/Result.hpp

@@ -1,7 +1,5 @@
 #pragma once
 
-#include "TermColor.hpp"
-
 #include <exception>
 #include <fmt/core.h>
 #include <memory>
@@ -49,46 +47,4 @@ inline constexpr auto to_anyhow = [](auto... xs) {
   return anyhow::anyhow(std::forward<decltype(xs)>(xs)...);
 };
 
-#if __has_include(<toml.hpp>)
-
-#  include <toml.hpp>
-
-namespace toml {
-
-template <typename T, typename... U>
-inline Result<T> try_find(const toml::value& v, const U&... u) noexcept {
-  using std::string_view_literals::operator""sv;
-
-  if (cabin::shouldColorStderr()) {
-    color::enable();
-  } else {
-    color::disable();
-  }
-
-  try {
-    return Ok(toml::find<T>(v, u...));
-  } catch (const std::exception& e) {
-    std::string what = e.what();
-
-    static constexpr std::size_t errorPrefixSize = "[error] "sv.size();
-    static constexpr std::size_t colorErrorPrefixSize =
-        "\033[31m\033[01m[error]\033[00m "sv.size();
-
-    if (cabin::shouldColorStderr()) {
-      what = what.substr(colorErrorPrefixSize);
-    } else {
-      what = what.substr(errorPrefixSize);
-    }
-
-    if (what.back() == '\n') {
-      what.pop_back(); // remove the last '\n' since Diag::error adds one.
-    }
-    return Err(anyhow::anyhow(what));
-  }
-}
-
-} // namespace toml
-
-#endif
-
 // NOLINTEND(readability-identifier-naming,cppcoreguidelines-macro-usage)