deps/ox/src/ox/std/error.hpp

@@ -167,28 +167,28 @@ struct [[nodiscard]] Result {
 
 	constexpr Error copyTo(type &val) const & noexcept {
 		if (!error) [[likely]] {
-			val = value;
+			*val = value;
 		}
 		return error;
 	}
 
 	constexpr Error copyTo(type &val) const && noexcept {
 		if (!error) [[likely]] {
-			val = value;
+			*val = value;
 		}
 		return error;
 	}
 
 	constexpr Error copyTo(type &val) & noexcept {
 		if (!error) [[likely]] {
-			val = value;
+			*val = value;
 		}
 		return error;
 	}
 
 	constexpr Error copyTo(type &val) && noexcept {
 		if (!error) [[likely]] {
-			val = std::move(value);
+			*val = std::move(value);
 		}
 		return error;
 	}
@@ -200,7 +200,6 @@ struct [[nodiscard]] Result {
 		return error;
 	}
 
-	[[nodiscard]]
 	constexpr T &unwrap() & noexcept {
 		if (error) {
 			oxPanic(error, "Failed unwrap");
@@ -208,7 +207,6 @@ struct [[nodiscard]] Result {
 		return value;
 	}
 
-	[[nodiscard]]
 	constexpr T &&unwrap() && noexcept {
 		if (error) {
 			oxPanic(error, "Failed unwrap");
@@ -216,7 +214,6 @@ struct [[nodiscard]] Result {
 		return std::move(value);
 	}
 
-	[[nodiscard]]
 	constexpr T const&unwrap() const & noexcept {
 		if (error) [[unlikely]] {
 			oxPanic(error, "Failed unwrap");
@@ -224,7 +221,6 @@ struct [[nodiscard]] Result {
 		return value;
 	}
 
-	[[nodiscard]]
 	constexpr T &unwrapThrow() & {
 		if (error) {
 			throw ox::Exception(error);
@@ -232,7 +228,6 @@ struct [[nodiscard]] Result {
 		return value;
 	}
 
-	[[nodiscard]]
 	constexpr T &&unwrapThrow() && {
 		if (error) {
 			throw ox::Exception(error);
@@ -240,7 +235,6 @@ struct [[nodiscard]] Result {
 		return std::move(value);
 	}
 
-	[[nodiscard]]
 	constexpr T const&unwrapThrow() const & {
 		if (error) {
 			throw ox::Exception(error);
@@ -249,21 +243,13 @@ struct [[nodiscard]] Result {
 	}
 
 	template<typename U = T>
-	constexpr ox::Result<U> to(auto const&f) & noexcept {
+	constexpr ox::Result<U> to(const auto &f) noexcept {
 		if (error) [[unlikely]] {
-			return error;
+			return OxError(1);
 		}
 		return f(value);
 	}
 
-	template<typename U = T>
-	constexpr ox::Result<U> to(auto const&f) && noexcept {
-		if (error) [[unlikely]] {
-			return error;
-		}
-		return f(std::move(value));
-	}
-
 };
 
 namespace detail {