Fix tests

mlua-rs · Aug 4, 2024 · 8e14b6e · 8e14b6e
1 parent c117a4c
commit 8e14b6e
Show file tree

Hide file tree

Showing 20 changed files with 245 additions and 312 deletions.
diff --git a/src/table.rs b/src/table.rs
@@ -882,7 +882,7 @@ pub trait TableExt: Sealed {
     /// passing the table itself along with `args` as function arguments.
     ///
     /// This is a shortcut for
-    /// `table.get::<_, Function>(key)?.call((table.clone(), arg1, ..., argN))`
+    /// `table.get::<Function>(key)?.call((table.clone(), arg1, ..., argN))`
     ///
     /// This might invoke the `__index` metamethod.
     fn call_method<R>(&self, name: &str, args: impl IntoLuaMulti) -> Result<R>
@@ -893,7 +893,7 @@ pub trait TableExt: Sealed {
     /// passing `args` as function arguments.
     ///
     /// This is a shortcut for
-    /// `table.get::<_, Function>(key)?.call(args)`
+    /// `table.get::<Function>(key)?.call(args)`
     ///
     /// This might invoke the `__index` metamethod.
     fn call_function<R>(&self, name: &str, args: impl IntoLuaMulti) -> Result<R>

diff --git a/src/userdata/ext.rs b/src/userdata/ext.rs
@@ -54,7 +54,7 @@ pub trait AnyUserDataExt: Sealed {
     /// passing `args` as function arguments.
     ///
     /// This is a shortcut for
-    /// `table.get::<_, Function>(key)?.call(args)`
+    /// `table.get::<Function>(key)?.call(args)`
     ///
     /// This might invoke the `__index` metamethod.
     fn call_function<R>(&self, name: &str, args: impl IntoLuaMulti) -> Result<R>

diff --git a/tests/compile.rs b/tests/compile.rs
@@ -12,7 +12,6 @@ fn test_compilation() {
     t.compile_fail("tests/compile/scope_invariance.rs");
     t.compile_fail("tests/compile/scope_mutable_aliasing.rs");
     t.compile_fail("tests/compile/scope_userdata_borrow.rs");
-    t.compile_fail("tests/compile/static_callback_args.rs");
 
     #[cfg(feature = "async")]
     {

diff --git a/tests/compile/async_any_userdata_method.stderr b/tests/compile/async_any_userdata_method.stderr
@@ -1,10 +1,18 @@
+error[E0596]: cannot borrow `s` as mutable, as it is a captured variable in a `Fn` closure
+  --> tests/compile/async_any_userdata_method.rs:9:58
+   |
+9  |         reg.add_async_method("t", |_, this: &String, ()| async {
+   |                                                          ^^^^^ cannot borrow as mutable
+10 |             s = this;
+   |             - mutable borrow occurs due to use of `s` in closure
+
 error: lifetime may not live long enough
   --> tests/compile/async_any_userdata_method.rs:9:58
    |
 9  |           reg.add_async_method("t", |_, this: &String, ()| async {
    |  ___________________________________----------------------_^
    | |                                   |                    |
-   | |                                   |                    return type of closure `{async block@$DIR/tests/compile/async_any_userdata_method.rs:9:58: 12:10}` contains a lifetime `'2`
+   | |                                   |                    return type of closure `{async block@$DIR/tests/compile/async_any_userdata_method.rs:9:58: 9:63}` contains a lifetime `'2`
    | |                                   lifetime `'1` represents this closure's body
 10 | |             s = this;
 11 | |             Ok(())
@@ -13,17 +21,6 @@ error: lifetime may not live long enough
    |
    = note: closure implements `Fn`, so references to captured variables can't escape the closure
 
-error[E0596]: cannot borrow `s` as mutable, as it is a captured variable in a `Fn` closure
-  --> tests/compile/async_any_userdata_method.rs:9:58
-   |
-9  |           reg.add_async_method("t", |_, this: &String, ()| async {
-   |  __________________________________________________________^
-10 | |             s = this;
-   | |             - mutable borrow occurs due to use of `s` in closure
-11 | |             Ok(())
-12 | |         });
-   | |_________^ cannot borrow as mutable
-
 error[E0597]: `s` does not live long enough
   --> tests/compile/async_any_userdata_method.rs:8:21
    |

diff --git a/tests/compile/lua_norefunwindsafe.stderr b/tests/compile/lua_norefunwindsafe.stderr
@@ -1,59 +1,78 @@
-error[E0277]: the type `UnsafeCell<mlua::lua::ExtraData>` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary
+error[E0277]: the type `UnsafeCell<*mut lua_State>` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary
  --> tests/compile/lua_norefunwindsafe.rs:7:18
   |
 7 |     catch_unwind(|| lua.create_table().unwrap());
-  |     ------------ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `UnsafeCell<mlua::lua::ExtraData>` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary
+  |     ------------ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `UnsafeCell<*mut lua_State>` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary
   |     |
   |     required by a bound introduced by this call
   |
-  = help: within `Lua`, the trait `RefUnwindSafe` is not implemented for `UnsafeCell<mlua::lua::ExtraData>`
-note: required because it appears within the type `ArcInner<UnsafeCell<ExtraData>>`
- --> $RUST/alloc/src/sync.rs
+  = help: within `mlua::types::sync::inner::ReentrantMutex<mlua::state::raw::RawLua>`, the trait `RefUnwindSafe` is not implemented for `UnsafeCell<*mut lua_State>`, which is required by `{closure@$DIR/tests/compile/lua_norefunwindsafe.rs:7:18: 7:20}: UnwindSafe`
+note: required because it appears within the type `Cell<*mut lua_State>`
+ --> $RUST/core/src/cell.rs
   |
-  | struct ArcInner<T: ?Sized> {
-  |        ^^^^^^^^
-note: required because it appears within the type `PhantomData<ArcInner<UnsafeCell<ExtraData>>>`
- --> $RUST/core/src/marker.rs
+  | pub struct Cell<T: ?Sized> {
+  |            ^^^^
+note: required because it appears within the type `mlua::state::raw::RawLua`
+ --> src/state/raw.rs
   |
-  | pub struct PhantomData<T: ?Sized>;
-  |            ^^^^^^^^^^^
-note: required because it appears within the type `Arc<UnsafeCell<ExtraData>>`
- --> $RUST/alloc/src/sync.rs
+  | pub struct RawLua {
+  |            ^^^^^^
+note: required because it appears within the type `mlua::types::sync::inner::ReentrantMutex<mlua::state::raw::RawLua>`
+ --> src/types/sync.rs
   |
-  | pub struct Arc<
+  |     pub(crate) struct ReentrantMutex<T>(T);
+  |                       ^^^^^^^^^^^^^^
+  = note: required for `Rc<mlua::types::sync::inner::ReentrantMutex<mlua::state::raw::RawLua>>` to implement `RefUnwindSafe`
+note: required because it appears within the type `Lua`
+ --> src/state.rs
+  |
+  | pub struct Lua(XRc<ReentrantMutex<RawLua>>);
   |            ^^^
-note: required because it appears within the type `LuaInner`
- --> src/lua.rs
+  = note: required for `&Lua` to implement `UnwindSafe`
+note: required because it's used within this closure
+ --> tests/compile/lua_norefunwindsafe.rs:7:18
   |
-  | pub struct LuaInner {
-  |            ^^^^^^^^
-note: required because it appears within the type `ArcInner<LuaInner>`
- --> $RUST/alloc/src/sync.rs
+7 |     catch_unwind(|| lua.create_table().unwrap());
+  |                  ^^
+note: required by a bound in `std::panic::catch_unwind`
+ --> $RUST/std/src/panic.rs
   |
-  | struct ArcInner<T: ?Sized> {
-  |        ^^^^^^^^
-note: required because it appears within the type `PhantomData<ArcInner<LuaInner>>`
- --> $RUST/core/src/marker.rs
+  | pub fn catch_unwind<F: FnOnce() -> R + UnwindSafe, R>(f: F) -> Result<R> {
+  |                                        ^^^^^^^^^^ required by this bound in `catch_unwind`
+
+error[E0277]: the type `UnsafeCell<mlua::state::extra::ExtraData>` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary
+ --> tests/compile/lua_norefunwindsafe.rs:7:18
+  |
+7 |     catch_unwind(|| lua.create_table().unwrap());
+  |     ------------ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `UnsafeCell<mlua::state::extra::ExtraData>` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary
+  |     |
+  |     required by a bound introduced by this call
   |
-  | pub struct PhantomData<T: ?Sized>;
-  |            ^^^^^^^^^^^
-note: required because it appears within the type `Arc<LuaInner>`
- --> $RUST/alloc/src/sync.rs
+  = help: the trait `RefUnwindSafe` is not implemented for `UnsafeCell<mlua::state::extra::ExtraData>`, which is required by `{closure@$DIR/tests/compile/lua_norefunwindsafe.rs:7:18: 7:20}: UnwindSafe`
+  = note: required for `Rc<UnsafeCell<mlua::state::extra::ExtraData>>` to implement `RefUnwindSafe`
+note: required because it appears within the type `mlua::state::raw::RawLua`
+ --> src/state/raw.rs
   |
-  | pub struct Arc<
-  |            ^^^
+  | pub struct RawLua {
+  |            ^^^^^^
+note: required because it appears within the type `mlua::types::sync::inner::ReentrantMutex<mlua::state::raw::RawLua>`
+ --> src/types/sync.rs
+  |
+  |     pub(crate) struct ReentrantMutex<T>(T);
+  |                       ^^^^^^^^^^^^^^
+  = note: required for `Rc<mlua::types::sync::inner::ReentrantMutex<mlua::state::raw::RawLua>>` to implement `RefUnwindSafe`
 note: required because it appears within the type `Lua`
- --> src/lua.rs
+ --> src/state.rs
   |
-  | pub struct Lua(Arc<LuaInner>);
+  | pub struct Lua(XRc<ReentrantMutex<RawLua>>);
   |            ^^^
   = note: required for `&Lua` to implement `UnwindSafe`
 note: required because it's used within this closure
  --> tests/compile/lua_norefunwindsafe.rs:7:18
   |
 7 |     catch_unwind(|| lua.create_table().unwrap());
   |                  ^^
-note: required by a bound in `catch_unwind`
+note: required by a bound in `std::panic::catch_unwind`
  --> $RUST/std/src/panic.rs
   |
   | pub fn catch_unwind<F: FnOnce() -> R + UnwindSafe, R>(f: F) -> Result<R> {

diff --git a/tests/compile/non_send.rs b/tests/compile/non_send.rs
@@ -11,7 +11,7 @@ fn main() -> Result<()> {
     lua.create_function(move |_, ()| {
         Ok(data.get())
     })?
-    .call::<_, i32>(())?;
+    .call::<i32>(())?;
 
     Ok(())
 }