Support new Luau require system

This commit introduces the `Require` trait that be used to change `require` behaviour.
By default mlua implements behaviour same as `ReplRequirer` in the original Luau.
Unfortunately binary Luau modules are no longer supported by the new system.

Author: khvzak

.github/workflows/main.yml

@@ -194,7 +194,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest]
         rust: [stable]
-        lua: [lua54, lua53, lua52, lua51, luajit, luau]
+        lua: [lua54, lua53, lua52, lua51, luajit]
         include:
           - os: ubuntu-latest
             target: x86_64-unknown-linux-gnu

Cargo.toml

@@ -32,7 +32,7 @@ lua52 = ["ffi/lua52"]
 lua51 = ["ffi/lua51"]
 luajit = ["ffi/luajit"]
 luajit52 = ["luajit", "ffi/luajit52"]
-luau = ["ffi/luau", "dep:libloading"]
+luau = ["ffi/luau"]
 luau-jit = ["luau", "ffi/luau-codegen"]
 luau-vector4 = ["luau", "ffi/luau-vector4"]
 vendored = ["ffi/vendored"]
@@ -61,9 +61,6 @@ rustversion = "1.0"
 
 ffi = { package = "mlua-sys", version = "0.6.6", path = "mlua-sys" }
 
-[target.'cfg(unix)'.dependencies]
-libloading = { version = "0.8", optional = true }
-
 [dev-dependencies]
 trybuild = "1.0"
 hyper = { version = "1.2", features = ["full"] }

mlua-sys/Cargo.toml

@@ -40,7 +40,7 @@ cfg-if = "1.0"
 pkg-config = "0.3.17"
 lua-src = { version = ">= 547.0.0, < 547.1.0", optional = true }
 luajit-src = { version = ">= 210.5.0, < 210.6.0", optional = true }
-luau0-src = { git = "https://github.com/mlua-rs/luau-src-rs", rev = "f89e9f2", optional = true }
+luau0-src = { git = "https://github.com/mlua-rs/luau-src-rs", rev = "37e1e34", optional = true }
 
 [lints.rust]
 unexpected_cfgs = { level = "allow", check-cfg = ['cfg(raw_dylib)'] }

mlua-sys/build/main_inner.rs

@@ -11,8 +11,8 @@ cfg_if::cfg_if! {
 }
 
 fn main() {
-    #[cfg(all(feature = "luau", feature = "module", windows))]
-    compile_error!("Luau does not support `module` mode on Windows");
+    #[cfg(all(feature = "luau", feature = "module"))]
+    compile_error!("Luau does not support `module` mode");
 
     #[cfg(all(feature = "module", feature = "vendored"))]
     compile_error!("`vendored` and `module` features are mutually exclusive");

mlua-sys/src/luau/luarequire.rs

@@ -101,7 +101,7 @@ pub struct luarequire_Configuration {
 
     // Executes the module and places the result on the stack. Returns the number of results placed on the
     // stack.
-    pub load: unsafe extern "C" fn(
+    pub load: unsafe extern "C-unwind" fn(
         L: *mut lua_State,
         ctx: *mut c_void,
         chunkname: *const c_char,

src/lib.rs

@@ -76,7 +76,7 @@ mod conversion;
 mod error;
 mod function;
 mod hook;
-#[cfg(feature = "luau")]
+#[cfg(any(feature = "luau", doc))]
 mod luau;
 mod memory;
 mod multi;
@@ -130,6 +130,7 @@ pub use crate::{
     buffer::Buffer,
     chunk::{CompileConstant, Compiler},
     function::CoverageInfo,
+    luau::{NavigateError, Require},
     vector::Vector,
 };
 

src/luau/mod.rs

@@ -2,12 +2,14 @@ use std::ffi::CStr;
 use std::os::raw::c_int;
 
 use crate::error::Result;
-use crate::state::Lua;
+use crate::state::{ExtraData, Lua, LuaOptions};
+
+pub use require::{NavigateError, Require};
 
 // Since Luau has some missing standard functions, we re-implement them here
 
 impl Lua {
-    pub(crate) unsafe fn configure_luau(&self) -> Result<()> {
+    pub(crate) unsafe fn configure_luau(&self, mut options: LuaOptions) -> Result<()> {
         let globals = self.globals();
 
         globals.raw_set("collectgarbage", self.create_c_function(lua_collectgarbage)?)?;
@@ -18,11 +20,13 @@ impl Lua {
             globals.raw_set("_VERSION", format!("Luau {version}"))?;
         }
 
-        Ok(())
-    }
+        // Enable `require` function
+        let requirer = (options.requirer.take()).unwrap_or_else(|| Box::new(require::TextRequirer::new()));
+        self.exec_raw::<()>((), |state| {
+            let requirer_ptr = (*ExtraData::get(state)).set_requirer(requirer);
+            ffi::luaopen_require(state, require::init_config, requirer_ptr as *mut _);
+        })?;
 
-    pub(crate) fn disable_c_modules(&self) -> Result<()> {
-        package::disable_dylibs(self);
         Ok(())
     }
 }
@@ -64,6 +68,4 @@ unsafe extern "C-unwind" fn lua_collectgarbage(state: *mut ffi::lua_State) -> c_
     }
 }
 
-pub(crate) use package::register_package_module;
-
-mod package;
+mod require;