michael/mlua
michael
/
mlua
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove `__ipairs` metamethod deprecated in lua 5.3 and not available by default

This commit is contained in:
Alex Orlenko 2020-01-25 19:41:02 +00:00
parent 07fc4642ae
commit e4dc773aa3
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/userdata.rs
View File

@ -77,11 +77,6 @@ pub enum MetaMethod {
/// ///
/// This is not an operator, but it will be called by the built-in `pairs` function. /// This is not an operator, but it will be called by the built-in `pairs` function.
Pairs, Pairs,
#[cfg(any(feature = "lua53", feature = "lua52"))]
/// The `__ipairs` metamethod.
///
/// This is not an operator, but it will be called by the built-in `ipairs` function.
IPairs,
} }
impl MetaMethod { impl MetaMethod {
@ -119,8 +114,6 @@ impl MetaMethod {
MetaMethod::ToString => b"__tostring", MetaMethod::ToString => b"__tostring",
#[cfg(any(feature = "lua53", feature = "lua52"))] #[cfg(any(feature = "lua53", feature = "lua52"))]
MetaMethod::Pairs => b"__pairs", MetaMethod::Pairs => b"__pairs",
#[cfg(any(feature = "lua53", feature = "lua52"))]
MetaMethod::IPairs => b"__ipairs",
} }
} }
} }

12
tests/userdata.rs
View File

@ -96,7 +96,7 @@ fn test_metamethods() -> Result<()> {
} }
}); });
#[cfg(any(feature = "lua53", feature = "lua52"))] #[cfg(any(feature = "lua53", feature = "lua52"))]
methods.add_meta_method(MetaMethod::IPairs, |lua, data, ()| { methods.add_meta_method(MetaMethod::Pairs, |lua, data, ()| {
use std::iter::FromIterator; use std::iter::FromIterator;
let stateless_iter = lua.create_function(|_, (data, i): (MyUserData, i64)| { let stateless_iter = lua.create_function(|_, (data, i): (MyUserData, i64)| {
let i = i + 1; let i = i + 1;
@ -121,12 +121,12 @@ fn test_metamethods() -> Result<()> {
); );
#[cfg(any(feature = "lua53", feature = "lua52"))] #[cfg(any(feature = "lua53", feature = "lua52"))]
let ipairs_it = { let pairs_it = {
lua.load( lua.load(
r#" r#"
function ipairs_it() function pairs_it()
local r = 0 local r = 0
for i, v in ipairs(userdata1) do for i, v in pairs(userdata1) do
r = r + v r = r + v
end end
return r return r
@ -134,14 +134,14 @@ fn test_metamethods() -> Result<()> {
"#, "#,
) )
.exec()?; .exec()?;
globals.get::<_, Function>("ipairs_it")? globals.get::<_, Function>("pairs_it")?
}; };
assert_eq!(lua.load("userdata1 - userdata2").eval::<MyUserData>()?.0, 4); assert_eq!(lua.load("userdata1 - userdata2").eval::<MyUserData>()?.0, 4);
assert_eq!(lua.load("userdata1:get()").eval::<i64>()?, 7); assert_eq!(lua.load("userdata1:get()").eval::<i64>()?, 7);
assert_eq!(lua.load("userdata2.inner").eval::<i64>()?, 3); assert_eq!(lua.load("userdata2.inner").eval::<i64>()?, 3);
#[cfg(any(feature = "lua53", feature = "lua52"))] #[cfg(any(feature = "lua53", feature = "lua52"))]
assert_eq!(ipairs_it.call::<_, i64>(())?, 28); assert_eq!(pairs_it.call::<_, i64>(())?, 28);
assert!(lua.load("userdata2.nonexist_field").eval::<()>().is_err()); assert!(lua.load("userdata2.nonexist_field").eval::<()>().is_err());
let userdata2: Value = globals.get("userdata2")?; let userdata2: Value = globals.get("userdata2")?;