Initial implementation of owned Lua types

src/conversion.rs

@@ -11,13 +11,13 @@ use bstr::{BStr, BString};
 use num_traits::cast;
 
 use crate::error::{Error, Result};
-use crate::function::Function;
+use crate::function::{Function, OwnedFunction};
 use crate::lua::Lua;
-use crate::string::String;
-use crate::table::Table;
-use crate::thread::Thread;
+use crate::string::{OwnedString, String};
+use crate::table::{OwnedTable, Table};
+use crate::thread::{OwnedThread, Thread};
 use crate::types::{LightUserData, MaybeSend};
-use crate::userdata::{AnyUserData, UserData};
+use crate::userdata::{AnyUserData, OwnedAnyUserData, UserData};
 use crate::value::{FromLua, Nil, ToLua, Value};
 
 impl<'lua> ToLua<'lua> for Value<'lua> {
@@ -54,6 +54,20 @@ impl<'lua> FromLua<'lua> for String<'lua> {
     }
 }
 
+impl<'lua> ToLua<'lua> for OwnedString {
+    #[inline]
+    fn to_lua(self, lua: &'lua Lua) -> Result<Value<'lua>> {
+        Ok(Value::String(String(lua.adopt_owned_ref(self.0))))
+    }
+}
+
+impl<'lua> FromLua<'lua> for OwnedString {
+    #[inline]
+    fn from_lua(value: Value<'lua>, lua: &'lua Lua) -> Result<OwnedString> {
+        String::from_lua(value, lua).map(|s| s.into_owned())
+    }
+}
+
 impl<'lua> ToLua<'lua> for Table<'lua> {
     #[inline]
     fn to_lua(self, _: &'lua Lua) -> Result<Value<'lua>> {
@@ -75,6 +89,20 @@ impl<'lua> FromLua<'lua> for Table<'lua> {
     }
 }
 
+impl<'lua> ToLua<'lua> for OwnedTable {
+    #[inline]
+    fn to_lua(self, lua: &'lua Lua) -> Result<Value<'lua>> {
+        Ok(Value::Table(Table(lua.adopt_owned_ref(self.0))))
+    }
+}
+
+impl<'lua> FromLua<'lua> for OwnedTable {
+    #[inline]
+    fn from_lua(value: Value<'lua>, lua: &'lua Lua) -> Result<OwnedTable> {
+        Table::from_lua(value, lua).map(|s| s.into_owned())
+    }
+}
+
 impl<'lua> ToLua<'lua> for Function<'lua> {
     #[inline]
     fn to_lua(self, _: &'lua Lua) -> Result<Value<'lua>> {
@@ -96,6 +124,20 @@ impl<'lua> FromLua<'lua> for Function<'lua> {
     }
 }
 
+impl<'lua> ToLua<'lua> for OwnedFunction {
+    #[inline]
+    fn to_lua(self, lua: &'lua Lua) -> Result<Value<'lua>> {
+        Ok(Value::Function(Function(lua.adopt_owned_ref(self.0))))
+    }
+}
+
+impl<'lua> FromLua<'lua> for OwnedFunction {
+    #[inline]
+    fn from_lua(value: Value<'lua>, lua: &'lua Lua) -> Result<OwnedFunction> {
+        Function::from_lua(value, lua).map(|s| s.into_owned())
+    }
+}
+
 impl<'lua> ToLua<'lua> for Thread<'lua> {
     #[inline]
     fn to_lua(self, _: &'lua Lua) -> Result<Value<'lua>> {
@@ -117,6 +159,20 @@ impl<'lua> FromLua<'lua> for Thread<'lua> {
     }
 }
 
+impl<'lua> ToLua<'lua> for OwnedThread {
+    #[inline]
+    fn to_lua(self, lua: &'lua Lua) -> Result<Value<'lua>> {
+        Ok(Value::Thread(Thread(lua.adopt_owned_ref(self.0))))
+    }
+}
+
+impl<'lua> FromLua<'lua> for OwnedThread {
+    #[inline]
+    fn from_lua(value: Value<'lua>, lua: &'lua Lua) -> Result<OwnedThread> {
+        Thread::from_lua(value, lua).map(|s| s.into_owned())
+    }
+}
+
 impl<'lua> ToLua<'lua> for AnyUserData<'lua> {
     #[inline]
     fn to_lua(self, _: &'lua Lua) -> Result<Value<'lua>> {
@@ -138,6 +194,20 @@ impl<'lua> FromLua<'lua> for AnyUserData<'lua> {
     }
 }
 
+impl<'lua> ToLua<'lua> for OwnedAnyUserData {
+    #[inline]
+    fn to_lua(self, lua: &'lua Lua) -> Result<Value<'lua>> {
+        Ok(Value::UserData(AnyUserData(lua.adopt_owned_ref(self.0))))
+    }
+}
+
+impl<'lua> FromLua<'lua> for OwnedAnyUserData {
+    #[inline]
+    fn from_lua(value: Value<'lua>, lua: &'lua Lua) -> Result<OwnedAnyUserData> {
+        AnyUserData::from_lua(value, lua).map(|s| s.into_owned())
+    }
+}
+
 impl<'lua, T: 'static + MaybeSend + UserData> ToLua<'lua> for T {
     #[inline]
     fn to_lua(self, lua: &'lua Lua) -> Result<Value<'lua>> {
@@ -145,6 +215,7 @@ impl<'lua, T: 'static + MaybeSend + UserData> ToLua<'lua> for T {
     }
 }
 
+// TODO: Remove
 impl<'lua, T: 'static + UserData + Clone> FromLua<'lua> for T {
     #[inline]
     fn from_lua(value: Value<'lua>, _: &'lua Lua) -> Result<T> {