a few more moves

Author: Prevter

include/rift/config.hpp

@@ -117,23 +117,23 @@ namespace rift {
                 // Unwrap the arguments with deduced types
                 auto res = unwrapArgs<Args...>(args);
                 if (res.isErr()) {
-                    return geode::Err(res.unwrapErr());
+                    return geode::Err(std::move(res).unwrapErr());
                 }
 
                 // Apply the unwrapped arguments to the lambda function
                 if constexpr (std::same_as<Ret, void>) {
-                    std::apply(func, res.unwrap());
+                    std::apply(func, std::move(res).unwrap());
                     return geode::Ok(Value());
                 } else {
-                    Ret ret = std::apply(func, std::move(res.unwrap()));
+                    Ret ret = std::apply(func, std::move(res).unwrap());
 
                     // Convert the result to the correct type
                     if constexpr (std::same_as<Ret, RuntimeFuncResult>) {
                         return ret; // Already a Result
                     } else if constexpr (std::same_as<Ret, Value>) {
                         return geode::Ok(std::move(ret)); // Forwards the Value
                     } else {
-                        return geode::Ok(Value(ret)); // Convert to Value
+                        return geode::Ok(Value(std::move(ret))); // Convert to Value
                     }
                 }
             };

src/config.cpp

@@ -37,7 +37,8 @@ namespace rift {
                 return geode::Ok(static_cast<int64_t>(arg.getString().size()));
             }
 
-            return geode::Ok(static_cast<int64_t>(arg.toString().size()));
+
+            return geode::Ok(static_cast<int64_t>(fmt::formatted_size("{}", arg)));
         }
 
         std::string toUpper(std::string&& str) noexcept {

src/value.cpp

@@ -262,7 +262,7 @@ namespace rift {
             auto const& value = other.toString();
 
             if (value.empty()) {
-                return geode::Ok(Value(str));
+                return geode::Ok(Value(std::move(str)));
             }
 
             size_t pos = 0;