Some DebugStack improvements

Author: khvzak

src/hook.rs

@@ -184,8 +184,8 @@ impl<'a> Debug<'a> {
             );
             #[cfg(feature = "luau")]
             mlua_assert!(
-                ffi::lua_getinfo(self.lua.state(), self.level, cstr!("a"), self.ar.get()) != 0,
-                "lua_getinfo failed with `a`"
+                ffi::lua_getinfo(self.lua.state(), self.level, cstr!("au"), self.ar.get()) != 0,
+                "lua_getinfo failed with `au`"
             );
 
             #[cfg(not(feature = "luau"))]
@@ -198,8 +198,8 @@ impl<'a> Debug<'a> {
             };
             #[cfg(feature = "luau")]
             let stack = DebugStack {
-                num_ups: (*self.ar.get()).nupvals as i32,
-                num_params: (*self.ar.get()).nparams as i32,
+                num_ups: (*self.ar.get()).nupvals,
+                num_params: (*self.ar.get()).nparams,
                 is_vararg: (*self.ar.get()).isvararg != 0,
             };
             stack
@@ -262,10 +262,15 @@ pub struct DebugSource<'a> {
 
 #[derive(Copy, Clone, Debug)]
 pub struct DebugStack {
-    pub num_ups: i32,
+    /// Number of upvalues.
+    pub num_ups: u8,
+    /// Number of parameters.
+    ///
     /// Requires `feature = "lua54/lua53/lua52/luau"`
     #[cfg(any(feature = "lua54", feature = "lua53", feature = "lua52", feature = "luau"))]
-    pub num_params: i32,
+    pub num_params: u8,
+    /// Whether the function is a vararg function.
+    ///
     /// Requires `feature = "lua54/lua53/lua52/luau"`
     #[cfg(any(feature = "lua54", feature = "lua53", feature = "lua52", feature = "luau"))]
     pub is_vararg: bool,

tests/tests.rs

@@ -106,7 +106,6 @@ fn test_exec() -> Result<()> {
         "#,
         )
         .eval()?;
-    println!("checkpoint");
     assert!(module.contains_key("func")?);
     assert_eq!(module.get::<Function>("func")?.call::<String>(())?, "hello");
 
@@ -631,8 +630,7 @@ fn test_recursive_mut_callback_error() -> Result<()> {
             // Whoops, this will recurse into the function and produce another mutable reference!
             lua.globals().get::<Function>("f")?.call::<()>(true)?;
             println!("Should not get here, mutable aliasing has occurred!");
-            println!("value at {:p}", r as *mut _);
-            println!("value is {}", r);
+            println!("value at {:p} is {r}", r as *mut _);
         }
 
         Ok(())
@@ -1134,6 +1132,13 @@ fn test_inspect_stack() -> Result<()> {
     })?;
     lua.globals().set("logline", logline)?;
 
+    let stack_info = lua.create_function(|lua, ()| {
+        let debug = lua.inspect_stack(1).unwrap(); // caller
+        let stack_info = debug.stack();
+        Ok(format!("{stack_info:?}"))
+    })?;
+    lua.globals().set("stack_info", stack_info)?;
+
     lua.load(
         r#"
         local function foo()
@@ -1143,10 +1148,18 @@ fn test_inspect_stack() -> Result<()> {
         local function bar()
             return foo()
         end
+        local stack_info = stack_info
+        local function baz(a, b, c, ...)
+            return stack_info()
+        end
 
         assert(foo() == '[string "chunk"]:3 hello')
         assert(bar() == '[string "chunk"]:3 hello')
-        assert(logline("world") == '[string "chunk"]:12 world')
+        assert(logline("world") == '[string "chunk"]:16 world')
+        assert(
+            baz() == 'DebugStack { num_ups: 1, num_params: 3, is_vararg: true }' or
+            baz() == 'DebugStack { num_ups: 1 }'
+        )
     "#,
     )
     .set_name("chunk")