From d3d0cb3a3df3a844650882efa018ac625185c1c9 Mon Sep 17 00:00:00 2001 From: AsynchronousMatrix <38085006+4x8Matrix@users.noreply.github.com> Date: Thu, 10 Aug 2023 17:41:23 +0100 Subject: [PATCH 1/3] Update src/lune/builtins/luau.rs Co-authored-by: Filip Tibell --- src/lune/builtins/luau.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/lune/builtins/luau.rs b/src/lune/builtins/luau.rs index 6b84df7..e49b728 100644 --- a/src/lune/builtins/luau.rs +++ b/src/lune/builtins/luau.rs @@ -105,13 +105,12 @@ pub fn create(lua: &'static Lua) -> LuaResult { fn compile_source<'lua>( lua: &'lua Lua, - (source, options): (LuaString<'lua>, Option), + (source, options): (LuaString<'lua>, CompileOptions), ) -> LuaResult> { - let _options = options.unwrap_or_default(); let source_bytecode_bytes = LuaCompiler::default() - .set_optimization_level(_options.optimization_level) - .set_coverage_level(_options.coverage_level) - .set_debug_level(_options.debug_level) + .set_optimization_level(options.optimization_level) + .set_coverage_level(options.coverage_level) + .set_debug_level(options.debug_level) .compile(source); lua.create_string(source_bytecode_bytes) From 38a77238b7511d8d7d992346ad601b1bbd057bc4 Mon Sep 17 00:00:00 2001 From: AsynchronousMatrix <38085006+4x8Matrix@users.noreply.github.com> Date: Thu, 10 Aug 2023 17:41:34 +0100 Subject: [PATCH 2/3] Update src/lune/builtins/luau.rs Co-authored-by: Filip Tibell --- src/lune/builtins/luau.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lune/builtins/luau.rs b/src/lune/builtins/luau.rs index e49b728..b455d91 100644 --- a/src/lune/builtins/luau.rs +++ b/src/lune/builtins/luau.rs @@ -87,7 +87,7 @@ impl<'lua> FromLua<'lua> for LoadOptions { from: value.type_name(), to: "LoadOptions", message: Some(format!( - "Invalid compile options - expected string or table, got {}", + "Invalid load options - expected string or table, got {}", value.type_name() )), }) From 878e939d952891e0f8b016e6bed3f4504e14ff41 Mon Sep 17 00:00:00 2001 From: AsynchronousMatrix <38085006+4x8Matrix@users.noreply.github.com> Date: Thu, 10 Aug 2023 17:41:58 +0100 Subject: [PATCH 3/3] Update src/lune/builtins/luau.rs Co-authored-by: Filip Tibell --- src/lune/builtins/luau.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/lune/builtins/luau.rs b/src/lune/builtins/luau.rs index b455d91..ee21d1a 100644 --- a/src/lune/builtins/luau.rs +++ b/src/lune/builtins/luau.rs @@ -118,11 +118,9 @@ fn compile_source<'lua>( fn load_source<'a>( lua: &'static Lua, - (source, options): (LuaString<'a>, Option), + (source, options): (LuaString<'a>, LoadOptions), ) -> LuaResult> { - let _options = options.unwrap_or_default(); - lua.load(source.to_str()?.trim_start()) - .set_name(_options.debug_name) + .set_name(options.debug_name) .into_function() }