Fix Result::or_else not returning the return value of the callable

SizzinSeal · SizzinSeal · commit 94226cc8800d · 2025-06-23T13:26:45.000-07:00
diff --git a/include/common/result.hpp b/include/common/result.hpp
@@ -170,8 +170,7 @@ class Result<T, Errs...> {
             if constexpr (std::same_as<std::monostate, std::remove_cvref_t<decltype(arg)>>) {
                 throw std::logic_error("This exception is unreachable");
             } else {
-                std::invoke(f, std::forward<decltype(arg)>(arg));
-                return std::forward<decltype(arg)>(arg);
+                return std::invoke(f, std::forward<decltype(arg)>(arg));
             }
         }, std::forward<Self>(self).error);
     }
@@ -342,8 +341,7 @@ class Result<void, Errs...> {
             if constexpr (std::same_as<std::monostate, std::remove_cvref_t<decltype(arg)>>) {
                 throw std::logic_error("This exception is unreachable");
             } else {
-                std::invoke(f, std::forward<decltype(arg)>(arg));
-                return std::forward<decltype(arg)>(arg);
+                return std::invoke(f, std::forward<decltype(arg)>(arg));
             }
         }, std::forward<Self>(self).error);
     }

Original file line number	Diff line number	Diff line change
`@@ -170,8 +170,7 @@ class Result<T, Errs...> {`
`170`	`170`	`if constexpr (std::same_as<std::monostate, std::remove_cvref_t<decltype(arg)>>) {`
`171`	`171`	`throw std::logic_error("This exception is unreachable");`
`172`	`172`	`} else {`
`173`		`- std::invoke(f, std::forward<decltype(arg)>(arg));`
`174`		`- return std::forward<decltype(arg)>(arg);`
	`173`	`+ return std::invoke(f, std::forward<decltype(arg)>(arg));`
`175`	`174`	`}`
`176`	`175`	`}, std::forward<Self>(self).error);`
`177`	`176`	`}`
`@@ -342,8 +341,7 @@ class Result<void, Errs...> {`
`342`	`341`	`if constexpr (std::same_as<std::monostate, std::remove_cvref_t<decltype(arg)>>) {`
`343`	`342`	`throw std::logic_error("This exception is unreachable");`
`344`	`343`	`} else {`
`345`		`- std::invoke(f, std::forward<decltype(arg)>(arg));`
`346`		`- return std::forward<decltype(arg)>(arg);`
	`344`	`+ return std::invoke(f, std::forward<decltype(arg)>(arg));`
`347`	`345`	`}`
`348`	`346`	`}, std::forward<Self>(self).error);`
`349`	`347`	`}`