From d1251ac30f564877303e5b22c570b2178d68d30e Mon Sep 17 00:00:00 2001
From: alk <45172705+altalk23@users.noreply.github.com>
Date: Thu, 21 Nov 2024 09:48:31 +0300
Subject: [PATCH] move isresult out

---
 include/Geode/Result.hpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/include/Geode/Result.hpp b/include/Geode/Result.hpp
index 994426a..5bc3b8a 100644
--- a/include/Geode/Result.hpp
+++ b/include/Geode/Result.hpp
@@ -233,9 +233,6 @@ namespace geode {
             using ErrType = ErrType2;
         };
 
-        template <class Type>
-        concept IsResult = IsResultImpl<Type>::value;
-
         template <class Type>
         using ResultOkType = typename IsResultImpl<Type>::OkType;
 
@@ -250,6 +247,9 @@ namespace geode {
         concept IsStringStreamable = requires(std::stringstream ss, Type t) { ss << t; };
     }
 
+    template <class Type>
+    concept IsResult = impl::IsResultImpl<Type>::value;
+
     /// @brief Constructs a new Ok value
     /// @param ok the value to wrap in an Ok
     /// @return a new Ok value
@@ -1591,7 +1591,7 @@ namespace geode {
         /// @param operation the operation to perform if this Result is Ok
         /// @return the result of the operation if this Result is Ok, otherwise this Result
         template <class Operation>
-            requires(std::invocable<Operation, OkType> && impl::IsResult<std::invoke_result_t<Operation, OkType>> && std::convertible_to<ErrType, impl::ResultErrType<std::invoke_result_t<Operation, OkType>>>)
+            requires(std::invocable<Operation, OkType> && IsResult<std::invoke_result_t<Operation, OkType>> && std::convertible_to<ErrType, impl::ResultErrType<std::invoke_result_t<Operation, OkType>>>)
         constexpr std::invoke_result_t<Operation, OkType> andThen(Operation&& operation
         ) && noexcept(noexcept(operation(std::declval<OkType>()))) {
             if (this->isOk()) {
@@ -1606,7 +1606,7 @@ namespace geode {
         /// @param operation the operation to perform if this Result is Ok
         /// @return the result of the operation if this Result is Ok, otherwise this Result
         template <class Operation>
-            requires(std::invocable<Operation, OkType> && impl::IsResult<std::invoke_result_t<Operation, OkType>> && std::convertible_to<ErrType, impl::ResultErrType<std::invoke_result_t<Operation, OkType>>>)
+            requires(std::invocable<Operation, OkType> && IsResult<std::invoke_result_t<Operation, OkType>> && std::convertible_to<ErrType, impl::ResultErrType<std::invoke_result_t<Operation, OkType>>>)
         constexpr std::invoke_result_t<Operation, OkType> andThen(Operation&& operation
         ) const& noexcept(noexcept(operation(std::declval<OkType>()))) {
             if (this->isOk()) {
@@ -1621,7 +1621,7 @@ namespace geode {
         /// @param operation the operation to perform if this Result is Ok
         /// @return the result of the operation if this Result is Ok, otherwise this Result
         template <class Operation>
-            requires(std::invocable<Operation> && impl::IsResult<std::invoke_result_t<Operation>> && std::convertible_to<ErrType, impl::ResultErrType<std::invoke_result_t<Operation>>>)
+            requires(std::invocable<Operation> && IsResult<std::invoke_result_t<Operation>> && std::convertible_to<ErrType, impl::ResultErrType<std::invoke_result_t<Operation>>>)
         constexpr std::invoke_result_t<Operation> andThen(Operation&& operation
         ) && noexcept(noexcept(operation())) {
             if (this->isOk()) {
@@ -1636,7 +1636,7 @@ namespace geode {
         /// @param operation the operation to perform if this Result is Ok
         /// @return the result of the operation if this Result is Ok, otherwise this Result
         template <class Operation>
-            requires(std::invocable<Operation> && impl::IsResult<std::invoke_result_t<Operation>> && std::convertible_to<ErrType, impl::ResultErrType<std::invoke_result_t<Operation>>>)
+            requires(std::invocable<Operation> && IsResult<std::invoke_result_t<Operation>> && std::convertible_to<ErrType, impl::ResultErrType<std::invoke_result_t<Operation>>>)
         constexpr std::invoke_result_t<Operation> andThen(Operation&& operation
         ) const& noexcept(noexcept(operation())) {
             if (this->isOk()) {
@@ -1677,7 +1677,7 @@ namespace geode {
         /// @param operation the operation to perform if this Result is Err
         /// @return the result of the operation if this Result is Err, otherwise this Result
         template <class Operation>
-            requires(std::invocable<Operation, ErrType> && impl::IsResult<std::invoke_result_t<Operation, ErrType>> && std::convertible_to<OkType, impl::ResultOkType<std::invoke_result_t<Operation, ErrType>>>)
+            requires(std::invocable<Operation, ErrType> && IsResult<std::invoke_result_t<Operation, ErrType>> && std::convertible_to<OkType, impl::ResultOkType<std::invoke_result_t<Operation, ErrType>>>)
         constexpr std::invoke_result_t<Operation, ErrType> orElse(Operation&& operation
         ) && noexcept(noexcept(operation(std::declval<ErrType>()))) {
             if (this->isOk()) {
@@ -1692,7 +1692,7 @@ namespace geode {
         /// @param operation the operation to perform if this Result is Err
         /// @return the result of the operation if this Result is Err, otherwise this Result
         template <class Operation>
-            requires(std::invocable<Operation, ErrType> && impl::IsResult<std::invoke_result_t<Operation, ErrType>> && std::convertible_to<OkType, impl::ResultOkType<std::invoke_result_t<Operation, ErrType>>>)
+            requires(std::invocable<Operation, ErrType> && IsResult<std::invoke_result_t<Operation, ErrType>> && std::convertible_to<OkType, impl::ResultOkType<std::invoke_result_t<Operation, ErrType>>>)
         constexpr std::invoke_result_t<Operation, ErrType> orElse(Operation&& operation
         ) const& noexcept(noexcept(operation(std::declval<ErrType>()))) {
             if (this->isOk()) {
@@ -1707,7 +1707,7 @@ namespace geode {
         /// @param operation the operation to perform if this Result is Err
         /// @return the result of the operation if this Result is Err, otherwise this Result
         template <class Operation>
-            requires(std::invocable<Operation> && impl::IsResult<std::invoke_result_t<Operation>> && std::convertible_to<OkType, impl::ResultOkType<std::invoke_result_t<Operation>>>)
+            requires(std::invocable<Operation> && IsResult<std::invoke_result_t<Operation>> && std::convertible_to<OkType, impl::ResultOkType<std::invoke_result_t<Operation>>>)
         constexpr std::invoke_result_t<Operation> orElse(Operation&& operation
         ) && noexcept(noexcept(operation())) {
             if (this->isOk()) {
@@ -1722,7 +1722,7 @@ namespace geode {
         /// @param operation the operation to perform if this Result is Err
         /// @return the result of the operation if this Result is Err, otherwise this Result
         template <class Operation>
-            requires(std::invocable<Operation> && impl::IsResult<std::invoke_result_t<Operation>> && std::convertible_to<OkType, impl::ResultOkType<std::invoke_result_t<Operation>>>)
+            requires(std::invocable<Operation> && IsResult<std::invoke_result_t<Operation>> && std::convertible_to<OkType, impl::ResultOkType<std::invoke_result_t<Operation>>>)
         constexpr std::invoke_result_t<Operation> orElse(Operation&& operation
         ) const& noexcept(noexcept(operation())) {
             if (this->isOk()) {
@@ -1779,7 +1779,7 @@ namespace geode {
         /// @return the inner Result if the Result is Ok, otherwise the outer Result
         constexpr Result<impl::ResultOkType<OkType>, ErrType> flatten(
         ) && noexcept(std::is_nothrow_move_constructible_v<OkType> && std::is_nothrow_move_constructible_v<ErrType>)
-            requires(impl::IsResult<OkType> && std::same_as<ErrType, impl::ResultErrType<OkType>>)
+            requires(IsResult<OkType> && std::same_as<ErrType, impl::ResultErrType<OkType>>)
         {
             if (this->isOk()) {
                 return std::move(*this).unwrap();
@@ -1793,7 +1793,7 @@ namespace geode {
         /// @return the inner Result if the Result is Ok, otherwise the outer Result
         constexpr Result<impl::ResultOkType<OkType>, ErrType> flatten(
         ) const& noexcept(std::is_nothrow_move_constructible_v<OkType> && std::is_nothrow_move_constructible_v<ErrType>)
-            requires(impl::IsResult<OkType> && std::same_as<ErrType, impl::ResultErrType<OkType>>)
+            requires(IsResult<OkType> && std::same_as<ErrType, impl::ResultErrType<OkType>>)
         {
             if (this->isOk()) {
                 return this->unwrap();