Updates to get tests passing with mlua.

This is the first batch.

Author: jugglerchris

Cargo.toml

@@ -15,7 +15,7 @@ categories = [ "api-bindings", "development-tools::ffi" ]
 circle-ci = { repository = "mlua-rs/rlua", branch = "master" }
 
 [dependencies]
-mlua = { version = "0.9.5" }
+mlua = { version = "0.9.5", features = ["macros"] }
 
 [features]
 default=["builtin-lua54"]
@@ -34,9 +34,8 @@ system-luajit=["mlua/luajit"]
 # Enabled functions from the math module that have been deprecated
 #lua-compat-mathlib = []
 
-
-
 [dev-dependencies]
 rustyline = "13.0"
-criterion = "0.5.1"
-compiletest_rs = { version = "0.10.2", features = ["stable"] }
+#criterion = "0.5.1"
+#compiletest_rs = { version = "0.10.2", features = ["stable"] }
+bstr = "1.9.0"

examples/custom_lua_path.rs

@@ -1,4 +1,4 @@
-use rlua::{Lua, Result};
+use rlua::{Lua, Result, RluaCompat};
 
 fn main() -> Result<()> {
     let lua = Lua::new();
@@ -11,7 +11,7 @@ fn main() -> Result<()> {
         // require a module located in the newly added directory
         lua_ctx.load("require'new_module'").exec()?;
 
-        Ok(())
+        Ok::<_, rlua::Error>(())
     })?;
 
     Ok(())

examples/guided_tour.rs

@@ -1,7 +1,7 @@
 use std::f32;
 use std::iter::FromIterator;
 
-use rlua::{Function, Lua, MetaMethod, Result, UserData, UserDataMethods, Variadic};
+use rlua::{Function, Lua, MetaMethod, Result, UserData, UserDataMethods, Variadic, RluaCompat};
 
 fn main() -> Result<()> {
     // You can create a new Lua state with `Lua::new()`.  This loads the default Lua std library
@@ -22,7 +22,7 @@ fn main() -> Result<()> {
         globals.set("string_var", "hello")?;
         globals.set("int_var", 42)?;
 
-        Ok(())
+        Ok::<_, rlua::Error>(())
     })?;
 
     lua.context(|lua_ctx| {
@@ -35,7 +35,7 @@ fn main() -> Result<()> {
         assert_eq!(globals.get::<_, String>("string_var")?, "hello");
         assert_eq!(globals.get::<_, i64>("int_var")?, 42);
 
-        Ok(())
+        Ok::<_, rlua::Error>(())
     })?;
 
     lua.context(|lua_ctx| {
@@ -52,7 +52,7 @@ fn main() -> Result<()> {
                 global = 'foo'..'bar'
             "#,
             )
-            .set_name("example code")?
+            .set_name("example code")
             .exec()?;
         assert_eq!(globals.get::<_, String>("global")?, "foobar");
 
@@ -167,7 +167,7 @@ fn main() -> Result<()> {
         // Here's a worked example that shows many of the features of this API
         // together
 
-        #[derive(Copy, Clone)]
+        #[derive(Copy, Clone, mlua::FromLua)]
         struct Vec2(f32, f32);
 
         impl UserData for Vec2 {

examples/repl.rs

@@ -1,6 +1,6 @@
 //! This example shows a simple read-evaluate-print-loop (REPL).
 
-use rlua::{Error, Lua, MultiValue};
+use rlua::{Error, Lua, MultiValue, RluaCompat};
 
 fn main() {
     Lua::new().context(|lua| {

src/lib.rs

@@ -3,20 +3,31 @@ pub use mlua::*;
 pub mod prelude {
     pub use mlua::prelude::*;
     pub use super::ToLua;
+    pub use super::RluaCompat;
 }
 
 pub type Context<'lua> = &'lua Lua;
 
+pub trait RluaCompat {
+    fn context<R, F>(&self, f: F) -> R
+    where F: FnOnce(&Lua) -> R;
+}
+
+impl RluaCompat for Lua {
+    fn context<R, F>(&self, f: F) -> R
+    where F: FnOnce(&Lua) -> R {
+        f(self)
+    }
+}
+
 pub use mlua::IntoLua as ToLua;
-/*
-pub trait ToLua<'lua> {
-    fn to_lua(self, context: Context<'lua>) -> mlua::Result<Value<'lua>>;
+
+pub trait ToLuaCompat<'lua> {
+    fn to_lua(self, context: &'lua Lua) -> mlua::Result<Value<'lua>>;
 }
 
-impl<'lua, T: IntoLua<'lua>> ToLua<'lua> for T {
-    fn to_lua(self, context: Context<'lua>) -> mlua::Result<Value<'lua>> {
+impl<'lua, T:IntoLua<'lua>> ToLuaCompat<'lua> for T {
+    fn to_lua(self, context: &'lua Lua) -> mlua::Result<Value<'lua>> {
         self.into_lua(context)
     }
 }
-*/
-

tests/byte_string.rs

@@ -1,5 +1,5 @@
 use bstr::{BStr, BString};
-use rlua::Lua;
+use rlua::{Lua, RluaCompat};
 
 // Lua 5.1 doesn't have hex escapes
 #[cfg(not(rlua_lua51))]

tests/conversion.rs

@@ -1,4 +1,4 @@
-use rlua::{Integer, Lua, Result, String, Table, ToLua, Value};
+use rlua::{Integer, Lua, Result, String, Table, Value, RluaCompat, ToLuaCompat};
 
 fn valid_float(verify: Result<Value>, expected: f64) {
     let verify_unwrap = verify.unwrap();

tests/fromtolua.rs

@@ -1,4 +1,4 @@
-use rlua::Lua;
+use rlua::{Lua, RluaCompat};
 
 #[test]
 fn test_to_array() {

tests/function.rs

@@ -1,4 +1,4 @@
-use rlua::{Function, Lua, String};
+use rlua::{Function, Lua, String, RluaCompat};
 
 #[test]
 fn test_function() {

tests/hooks.rs

@@ -1,9 +1,8 @@
 use std::cell::RefCell;
 use std::ops::Deref;
-use std::str;
 use std::sync::{Arc, Mutex};
 
-use rlua::{Error, HookTriggers, Lua, Value};
+use rlua::{Error, HookTriggers, Lua, Value, RluaCompat};
 
 #[cfg(not(rlua_luajit))] // LuaJIT gives different results
 #[test]
@@ -52,8 +51,8 @@ fn function_calls() {
         move |_lua, debug| {
             let names = debug.names();
             let source = debug.source();
-            let name = names.name.map(|s| str::from_utf8(s).unwrap().to_owned());
-            let what = source.what.map(|s| str::from_utf8(s).unwrap().to_owned());
+            let name = names.name.map(|s| s.to_string());
+            let what = source.what;
             hook_output.lock().unwrap().push((name, what));
             Ok(())
         },
@@ -73,8 +72,8 @@ fn function_calls() {
     assert_eq!(
         *output,
         vec![
-            (None, Some("main".to_string())),
-            (Some("len".to_string()), Some("C".to_string()))
+            (None, "main"),
+            (Some("len".to_string()), "C")
         ]
     );
     #[cfg(rlua_luajit)]
@@ -119,16 +118,18 @@ fn error_within_hook() {
 #[test]
 fn limit_execution_instructions() {
     let lua = Lua::new();
-    let mut max_instructions = 10000;
+    let max_instructions = Arc::new(Mutex::new(10000));
+    let max_int = Arc::clone(&max_instructions);
 
     lua.set_hook(
         HookTriggers {
             every_nth_instruction: Some(30),
             ..Default::default()
         },
         move |_lua, _debug| {
-            max_instructions -= 30;
-            if max_instructions < 0 {
+            let mut max_instructions = max_int.lock().unwrap();
+            (*max_instructions) -= 30;
+            if (*max_instructions) < 0 {
                 Err(Error::RuntimeError("time's up".to_string()))
             } else {
                 Ok(())