From bedd430eb58a998f44fba213b71c8a597efb714a Mon Sep 17 00:00:00 2001
From: Alex Orlenko <zxteam@protonmail.com>
Date: Tue, 29 Dec 2020 22:08:53 +0000
Subject: [PATCH] Re-export mlua_derive

---
 Cargo.toml                 | 3 ++-
 README.md                  | 5 +----
 examples/module/Cargo.toml | 1 -
 examples/module/src/lib.rs | 2 +-
 src/lib.rs                 | 9 +++++++++
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 7d12670..c551a7f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,12 +33,13 @@ lua52 = []
 lua51 = []
 luajit = []
 vendored = ["lua-src", "luajit-src"]
-module = []
+module = ["mlua_derive"]
 async = ["futures-core", "futures-task", "futures-util"]
 send = []
 serialize = ["serde", "erased-serde"]
 
 [dependencies]
+mlua_derive = { version = "0.4", optional = true, path = "mlua_derive" }
 bstr = { version = "0.2", features = ["std"], default_features = false }
 lazy_static = { version = "1.4" }
 num-traits = { version = "0.2.14" }
diff --git a/README.md b/README.md
index 7be1778..aaf8f96 100644
--- a/README.md
+++ b/README.md
@@ -105,14 +105,11 @@ crate-type = ["cdylib"]
 
 [dependencies]
 mlua = { version = "0.4", features = ["lua53", "module"] }
-mlua_derive = "0.4"
 ```
 
 `lib.rs` :
 
 ``` rust
-#[macro_use]
-extern crate mlua_derive;
 use mlua::prelude::*;
 
 fn hello(_: &Lua, name: String) -> LuaResult<()> {
@@ -120,7 +117,7 @@ fn hello(_: &Lua, name: String) -> LuaResult<()> {
     Ok(())
 }
 
-#[lua_module]
+#[mlua::lua_module]
 fn my_module(lua: &Lua) -> LuaResult<LuaTable> {
     let exports = lua.create_table()?;
     exports.set("hello", lua.create_function(hello)?)?;
diff --git a/examples/module/Cargo.toml b/examples/module/Cargo.toml
index ee03306..02f9a67 100644
--- a/examples/module/Cargo.toml
+++ b/examples/module/Cargo.toml
@@ -17,4 +17,3 @@ vendored = ["mlua/vendored"]
 
 [dependencies]
 mlua = { path = "../..", features = ["module"] }
-mlua_derive = { path = "../../mlua_derive" }
diff --git a/examples/module/src/lib.rs b/examples/module/src/lib.rs
index 24056a1..38cc0fd 100644
--- a/examples/module/src/lib.rs
+++ b/examples/module/src/lib.rs
@@ -8,7 +8,7 @@ fn used_memory(lua: &Lua, _: ()) -> LuaResult<usize> {
     Ok(lua.used_memory())
 }
 
-#[mlua_derive::lua_module]
+#[mlua::lua_module]
 fn rust_module(lua: &Lua) -> LuaResult<LuaTable> {
     let exports = lua.create_table()?;
     exports.set("sum", lua.create_function(sum)?)?;
diff --git a/src/lib.rs b/src/lib.rs
index 5bccb25..cc5d0d8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -115,3 +115,12 @@ pub use crate::serde::LuaSerdeExt;
 pub mod prelude;
 #[cfg(feature = "serialize")]
 pub mod serde;
+
+// Re-export #[mlua_derive::lua_module].
+#[cfg(feature = "mlua_derive")]
+#[allow(unused_imports)]
+#[macro_use]
+extern crate mlua_derive;
+#[cfg(feature = "mlua_derive")]
+#[doc(hidden)]
+pub use mlua_derive::*;