Skip to content

Commit

Permalink
Merge branch 'dev' into feat/small-binaries
Browse files Browse the repository at this point in the history
  • Loading branch information
zaaarf authored Oct 13, 2024
2 parents 8f94b29 + 3c0a5d4 commit f15fec6
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/ffi/java/ext.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use jni_toolbox::jni;
#[allow(non_snake_case)]
#[jni(package = "mp.code", class = "Extensions")]
fn version() -> String {
crate::version()
crate::version().to_string()
}

/// Calculate the XXH3 hash for a given String.
Expand Down
2 changes: 1 addition & 1 deletion src/ffi/js/cursor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,6 @@ impl CursorController {
/// Block until next
#[napi(js_name = "recv")]
pub async fn js_recv(&self) -> napi::Result<crate::api::Cursor> {
Ok(self.recv().await?.into())
Ok(self.recv().await?)
}
}
2 changes: 1 addition & 1 deletion src/ffi/js/ext.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ 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()
crate::version().to_string()
}
2 changes: 1 addition & 1 deletion src/ffi/lua/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ fn entrypoint(lua: &Lua) -> LuaResult<LuaTable> {

exports.set(
"version",
lua.create_function(|_, ()| Ok(crate::version()))?,
lua.create_function(|_, ()| Ok(crate::version().to_string()))?,
)?;

// runtime
Expand Down
2 changes: 1 addition & 1 deletion src/ffi/python/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ impl Driver {

#[pyfunction]
fn version() -> String {
crate::version()
crate::version().to_string()
}

#[pyfunction]
Expand Down
4 changes: 2 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,6 @@ pub mod ffi;
pub(crate) mod network;

/// Get the current version of the client
pub fn version() -> String {
env!("CARGO_PKG_VERSION").to_owned()
pub fn version() -> &'static str {
env!("CARGO_PKG_VERSION")
}

0 comments on commit f15fec6

Please sign in to comment.