diff --git a/src/conversion.rs b/src/conversion.rs index d7db574..e643e93 100644 --- a/src/conversion.rs +++ b/src/conversion.rs @@ -37,7 +37,7 @@ impl<'lua> FromLua<'lua> for String<'lua> { } impl<'lua> ToLua<'lua> for Table<'lua> { - fn to_lua(self, _: &'lua Lua) -> Result { + fn to_lua(self, _: &'lua Lua) -> Result> { Ok(Value::Table(self)) } } @@ -270,14 +270,16 @@ impl<'lua, T: FromLua<'lua>> FromLua<'lua> for Vec { } impl<'lua, K: Eq + Hash + ToLua<'lua>, V: ToLua<'lua>, S: BuildHasher> ToLua<'lua> - for HashMap { + for HashMap +{ fn to_lua(self, lua: &'lua Lua) -> Result> { Ok(Value::Table(lua.create_table_from(self)?)) } } impl<'lua, K: Eq + Hash + FromLua<'lua>, V: FromLua<'lua>, S: BuildHasher + Default> FromLua<'lua> - for HashMap { + for HashMap +{ fn from_lua(value: Value<'lua>, _: &'lua Lua) -> Result { if let Value::Table(table) = value { table.pairs().collect() diff --git a/src/multi.rs b/src/multi.rs index 3b22c5a..4d5a25a 100644 --- a/src/multi.rs +++ b/src/multi.rs @@ -139,7 +139,7 @@ impl<'lua, T: FromLua<'lua>> FromLuaMulti<'lua> for Variadic { macro_rules! impl_tuple { () => ( impl<'lua> ToLuaMulti<'lua> for () { - fn to_lua_multi(self, _: &'lua Lua) -> Result { + fn to_lua_multi(self, _: &'lua Lua) -> Result> { Ok(MultiValue::new()) } } diff --git a/src/userdata.rs b/src/userdata.rs index 21af656..72e557a 100644 --- a/src/userdata.rs +++ b/src/userdata.rs @@ -89,7 +89,7 @@ impl<'lua, T: UserData> UserDataMethods<'lua, T> { where A: FromLuaMulti<'lua>, R: ToLuaMulti<'lua>, - M: 'static + Send + for<'a> Fn(&'lua Lua, &'a T, A) -> Result, + M: 'static + Send + Fn(&'lua Lua, &T, A) -> Result, { self.methods .insert(name.to_owned(), Self::box_method(method)); @@ -104,7 +104,7 @@ impl<'lua, T: UserData> UserDataMethods<'lua, T> { where A: FromLuaMulti<'lua>, R: ToLuaMulti<'lua>, - M: 'static + Send + for<'a> FnMut(&'lua Lua, &'a mut T, A) -> Result, + M: 'static + Send + FnMut(&'lua Lua, &mut T, A) -> Result, { self.methods .insert(name.to_owned(), Self::box_method_mut(method)); @@ -155,7 +155,7 @@ impl<'lua, T: UserData> UserDataMethods<'lua, T> { where A: FromLuaMulti<'lua>, R: ToLuaMulti<'lua>, - M: 'static + Send + for<'a> Fn(&'lua Lua, &'a T, A) -> Result, + M: 'static + Send + Fn(&'lua Lua, &T, A) -> Result, { self.meta_methods.insert(meta, Self::box_method(method)); } @@ -172,7 +172,7 @@ impl<'lua, T: UserData> UserDataMethods<'lua, T> { where A: FromLuaMulti<'lua>, R: ToLuaMulti<'lua>, - M: 'static + Send + for<'a> FnMut(&'lua Lua, &'a mut T, A) -> Result, + M: 'static + Send + FnMut(&'lua Lua, &mut T, A) -> Result, { self.meta_methods.insert(meta, Self::box_method_mut(method)); } @@ -234,7 +234,7 @@ impl<'lua, T: UserData> UserDataMethods<'lua, T> { where A: FromLuaMulti<'lua>, R: ToLuaMulti<'lua>, - M: 'static + Send + for<'a> Fn(&'lua Lua, &'a T, A) -> Result, + M: 'static + Send + Fn(&'lua Lua, &T, A) -> Result, { Box::new(move |lua, mut args| { if let Some(front) = args.pop_front() { @@ -255,7 +255,7 @@ impl<'lua, T: UserData> UserDataMethods<'lua, T> { where A: FromLuaMulti<'lua>, R: ToLuaMulti<'lua>, - M: 'static + Send + for<'a> FnMut(&'lua Lua, &'a mut T, A) -> Result, + M: 'static + Send + FnMut(&'lua Lua, &mut T, A) -> Result, { let method = RefCell::new(method); Box::new(move |lua, mut args| {