From b09e9452f2f059a9e79e05e094c8664f6323193b Mon Sep 17 00:00:00 2001 From: alemi Date: Sun, 13 Oct 2024 18:42:37 +0200 Subject: [PATCH] fix: js, py and lua allow &'static str, use it --- src/ffi/java/ext.rs | 1 - src/ffi/js/ext.rs | 4 ++-- src/ffi/lua/mod.rs | 2 +- src/ffi/python/mod.rs | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/ffi/java/ext.rs b/src/ffi/java/ext.rs index d841bf8..fc1e4ff 100644 --- a/src/ffi/java/ext.rs +++ b/src/ffi/java/ext.rs @@ -1,7 +1,6 @@ use jni_toolbox::jni; /// Gets the current version of the Rust crate. -#[allow(non_snake_case)] #[jni(package = "mp.code", class = "Extensions")] fn version() -> String { crate::version().to_string() diff --git a/src/ffi/js/ext.rs b/src/ffi/js/ext.rs index 33579ec..52fbe3d 100644 --- a/src/ffi/js/ext.rs +++ b/src/ffi/js/ext.rs @@ -8,6 +8,6 @@ pub fn js_hash(data: String) -> i64 { /// Get the current version of the client #[napi(js_name = "version")] -pub fn js_version() -> String { - crate::version().to_string() +pub fn js_version() -> &'static str { + crate::version() } diff --git a/src/ffi/lua/mod.rs b/src/ffi/lua/mod.rs index 2e4c495..33792d0 100644 --- a/src/ffi/lua/mod.rs +++ b/src/ffi/lua/mod.rs @@ -45,7 +45,7 @@ fn entrypoint(lua: &Lua) -> LuaResult { exports.set( "version", - lua.create_function(|_, ()| Ok(crate::version().to_string()))?, + lua.create_function(|_, ()| Ok(crate::version()))?, )?; // runtime diff --git a/src/ffi/python/mod.rs b/src/ffi/python/mod.rs index 45bd5e5..bbeb91b 100644 --- a/src/ffi/python/mod.rs +++ b/src/ffi/python/mod.rs @@ -133,8 +133,8 @@ impl Driver { } #[pyfunction] -fn version() -> String { - crate::version().to_string() +fn version() -> &'static str { + crate::version() } #[pyfunction]