Merge branch 'dev' into feat/small-binaries

This commit is contained in:
zaaarf 2024-10-13 18:34:19 +02:00 committed by GitHub
commit f15fec6272
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 7 additions and 7 deletions

View file

@ -4,7 +4,7 @@ use jni_toolbox::jni;
#[allow(non_snake_case)] #[allow(non_snake_case)]
#[jni(package = "mp.code", class = "Extensions")] #[jni(package = "mp.code", class = "Extensions")]
fn version() -> String { fn version() -> String {
crate::version() crate::version().to_string()
} }
/// Calculate the XXH3 hash for a given String. /// Calculate the XXH3 hash for a given String.

View file

@ -52,6 +52,6 @@ impl CursorController {
/// Block until next /// Block until next
#[napi(js_name = "recv")] #[napi(js_name = "recv")]
pub async fn js_recv(&self) -> napi::Result<crate::api::Cursor> { pub async fn js_recv(&self) -> napi::Result<crate::api::Cursor> {
Ok(self.recv().await?.into()) Ok(self.recv().await?)
} }
} }

View file

@ -9,5 +9,5 @@ pub fn js_hash(data: String) -> i64 {
/// Get the current version of the client /// Get the current version of the client
#[napi(js_name = "version")] #[napi(js_name = "version")]
pub fn js_version() -> String { pub fn js_version() -> String {
crate::version() crate::version().to_string()
} }

View file

@ -45,7 +45,7 @@ fn entrypoint(lua: &Lua) -> LuaResult<LuaTable> {
exports.set( exports.set(
"version", "version",
lua.create_function(|_, ()| Ok(crate::version()))?, lua.create_function(|_, ()| Ok(crate::version().to_string()))?,
)?; )?;
// runtime // runtime

View file

@ -134,7 +134,7 @@ impl Driver {
#[pyfunction] #[pyfunction]
fn version() -> String { fn version() -> String {
crate::version() crate::version().to_string()
} }
#[pyfunction] #[pyfunction]

View file

@ -127,6 +127,6 @@ pub mod ffi;
pub(crate) mod network; pub(crate) mod network;
/// Get the current version of the client /// Get the current version of the client
pub fn version() -> String { pub fn version() -> &'static str {
env!("CARGO_PKG_VERSION").to_owned() env!("CARGO_PKG_VERSION")
} }