Upgrade to mlua 0.12.2

Author: khvzak

.github/workflows/ci.yml

@@ -9,7 +9,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        lua: [lua52, lua53, lua54, luau]
+        lua: [lua52, lua53, lua54, lua55, luau]
+        send: ["", ",send"]
     steps:
       - uses: actions/checkout@main
       - name: Cache cargo
@@ -22,10 +23,10 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
       - name: Run ${{ matrix.lua }} tests (basic)
         run: |
-          cargo test --features ${{ matrix.lua }},vendored
+          cargo test --features ${{ matrix.lua }},vendored${{ matrix.send }} -- --test-threads=1
       - name: Run ${{ matrix.lua }} tests (full)
         run: |
-          cargo test --features ${{ matrix.lua }},vendored,json,regex,yaml,http,task,net,tls
+          cargo test --features ${{ matrix.lua }},vendored,json,regex,yaml,http,reqwest,task,net,tls${{ matrix.send }} -- --test-threads=1
 
   rustfmt:
     name: Rustfmt
@@ -53,4 +54,4 @@ jobs:
         with:
           components: clippy
       - run: |
-          cargo clippy --features lua54,vendored,json,regex,yaml,http,task,net,tls -- -D warnings
+          cargo clippy --features lua55,vendored,json,regex,yaml,http,reqwest,task,net,tls -- -D warnings

Cargo.toml

@@ -12,6 +12,7 @@ lua51 = ["mlua/lua51"]
 lua52 = ["mlua/lua52"]
 lua53 = ["mlua/lua53"]
 lua54 = ["mlua/lua54"]
+lua55 = ["mlua/lua55"]
 luau = ["mlua/luau"]
 async = ["mlua/async", "dep:tokio", "dep:tokio-util", "dep:futures-util"]
 send = ["mlua/send"]
@@ -28,7 +29,7 @@ tls = ["net", "dep:rustls", "dep:tokio-rustls", "dep:rustls-pemfile", "dep:rustl
 
 [dependencies]
 bytes = "1"
-mlua = { version = "0.11.5", features = ["error-send", "macros"] }
+mlua = { version = "0.12.2", features = ["error-send", "macros"] }
 ouroboros = { version = "0.18", optional = true }
 serde = { version = "1.0", optional = true }
 serde_json = { version = "1.0", optional = true }

README.md

@@ -28,7 +28,7 @@ With the following optional modules:
 
 The following feature flags are passed to `mlua`, when enabled:
 
-- `lua51`, `lua52`, `lua53`, `lua54`, `luau` - Lua version selection
+- `lua51`, `lua52`, `lua53`, `lua54`, `lua55`, `luau` - Lua version selection
 - `send` - Enable `Send+Sync` support
 - `vendored` - Use vendored Lua
 

src/bytes.rs

@@ -2,8 +2,8 @@ use std::ops::{Deref, DerefMut};
 
 use bytes::Bytes;
 use mlua::{
-    BorrowedBytes, Error, FromLua, Lua, MetaMethod, Result, String as LuaString, Table, UserData,
-    UserDataMethods, UserDataRegistry, Value,
+    BorrowedBytes, Error, FromLua, Lua, LuaString, MetaMethod, Result, Table, UserData, UserDataMethods,
+    UserDataRegistry, Value,
 };
 
 /// A Lua userdata wrapper around [`Bytes`].
@@ -85,7 +85,7 @@ impl StringOrBytes {
 
 enum AsBytesRefImpl<'a> {
     Ref(&'a [u8]),
-    Lua(BorrowedBytes<'a>),
+    Lua(BorrowedBytes),
 }
 
 impl Deref for AsBytesRefImpl<'_> {

src/http/body.rs

@@ -242,16 +242,16 @@ impl UserData for LuaBody {
         // Consumes the body if it is not buffered, returns a function that can be
         // called to get the next chunk of data
         registry.add_method_mut("reader", |lua, this, ()| {
-            use std::cell::RefCell;
-            use std::rc::Rc;
+            use std::sync::Arc;
+
+            use tokio::sync::Mutex;
 
             let body_stream = this.consume_if_unbuffered().into_data_stream();
-            let body_stream = Rc::new(RefCell::new(body_stream));
+            let body_stream = Arc::new(Mutex::new(body_stream));
             lua.create_async_function(move |lua, ()| {
                 let body_stream = body_stream.clone();
-                #[allow(clippy::await_holding_refcell_ref)]
                 async move {
-                    let mut body_stream = lua_try!(body_stream.try_borrow_mut());
+                    let mut body_stream = lua_try!(body_stream.try_lock());
                     match body_stream.next().await {
                         Some(Ok(data)) => {
                             let data = lua.create_any_userdata(data)?;

src/http/headers.rs

@@ -1,7 +1,7 @@
 use http::header::{HeaderMap, HeaderName, HeaderValue};
 use mlua::{
-    Either, ExternalError, ExternalResult, FromLua, Lua, MetaMethod, Result, String as LuaString, Table,
-    UserData, UserDataMethods, Value,
+    Either, ExternalError, ExternalResult, FromLua, Lua, LuaString, MetaMethod, Result, Table, UserData,
+    UserDataMethods, Value,
 };
 
 /// A Lua userdata wrapper around [`http::HeaderMap`].

src/http/method.rs

@@ -1,4 +1,4 @@
-use mlua::{ExternalResult, FromLua, Lua, Result, String as LuaString, Value};
+use mlua::{ExternalResult, FromLua, Lua, LuaString, Result, Value};
 
 /// A Lua wrapper around [`http::Method`].
 #[derive(Clone, Default, Debug)]

src/http/request.rs

@@ -4,8 +4,7 @@ use http::request::{Parts, Request};
 use http_body_util::Either as EitherBody;
 use hyper::body::Incoming;
 use mlua::{
-    AnyUserData, Error, FromLua, Lua, MetaMethod, Result, String as LuaString, Table, UserData,
-    UserDataMethods, Value,
+    AnyUserData, Error, FromLua, Lua, LuaString, MetaMethod, Result, Table, UserData, UserDataMethods, Value,
 };
 
 use crate::http::{LuaBody, LuaHeaderMapExt, LuaHeaders, LuaMethod};

src/http/response.rs

@@ -6,8 +6,8 @@ use http::response::{Parts, Response};
 use http_body_util::{BodyExt, Either as EitherBody};
 use hyper_util::client::legacy::connect::HttpInfo;
 use mlua::{
-    AnyUserData, ExternalResult, FromLua, Lua, MetaMethod, Result, String as LuaString, UserData,
-    UserDataMethods, Value,
+    AnyUserData, ExternalResult, FromLua, Lua, LuaString, MetaMethod, Result, UserData, UserDataMethods,
+    Value,
 };
 
 use super::headers::LuaHeaderMapExt;

src/json.rs

@@ -1,10 +1,10 @@
 use std::result::Result as StdResult;
 use std::sync::Arc;
 
+use mlua::serde::SerializeOptions;
 use mlua::{
     AnyUserData, Error as LuaError, Function, Integer as LuaInteger, IntoLuaMulti, Lua, LuaSerdeExt,
-    MetaMethod, MultiValue, Result, SerializeOptions, String as LuaString, Table, UserData, UserDataMethods,
-    UserDataRefMut, Value,
+    LuaString, MetaMethod, MultiValue, Result, Table, UserData, UserDataMethods, UserDataRefMut, Value,
 };
 use ouroboros::self_referencing;
 use serde::{Serialize, Serializer};
@@ -18,6 +18,9 @@ pub(crate) struct JsonObject {
     current: *const serde_json::Value,
 }
 
+unsafe impl Send for JsonObject {}
+unsafe impl Sync for JsonObject {}
+
 impl Serialize for JsonObject {
     fn serialize<S: Serializer>(&self, serializer: S) -> StdResult<S::Ok, S::Error> {
         self.current().serialize(serializer)
@@ -68,11 +71,7 @@ impl JsonObject {
                 } else if let Some(n) = n.as_f64() {
                     Ok(Value::Number(n))
                 } else {
-                    Err(LuaError::ToLuaConversionError {
-                        from: "number".to_string(),
-                        to: "integer or float",
-                        message: Some("number is too big to fit in a Lua integer".to_owned()),
-                    })
+                    Err(LuaError::runtime("number is too big to fit in a Lua integer"))
                 }
             }
             serde_json::Value::String(s) => Ok(Value::String(lua.create_string(s)?)),