Fix broken nif load

farhadi · Jul 3, 2023 · ea9d4a6 · ea9d4a6
1 parent f586e49
commit ea9d4a6
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/native/xxh3/Cargo.lock b/native/xxh3/Cargo.lock
diff --git a/native/xxh3/Cargo.toml b/native/xxh3/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xxh3"
-version = "0.3.4"
+version = "0.3.5"
 authors = []
 edition = "2018"
 

diff --git a/src/cargo.hrl b/src/cargo.hrl
@@ -0,0 +1,14 @@
+-cargo_header_version(1).
+-ifndef(CARGO_LOAD_APP).
+-define(CARGO_LOAD_APP, xxh3).
+-endif.
+-ifndef(CARGO_HRL).
+-define(CARGO_HRL, 1).
+-define(load_nif_from_crate(__CRATE, __INIT),
+    (fun() ->
+        __APP = ?CARGO_LOAD_APP,
+        __PATH = filename:join([code:priv_dir(__APP), "crates", __CRATE, __CRATE]),
+        erlang:load_nif(__PATH, __INIT)
+    end)()
+).
+-endif.
diff --git a/src/crates.hrl b/src/crates.hrl
diff --git a/src/xxh3.app.src b/src/xxh3.app.src
@@ -1,6 +1,6 @@
 {application, xxh3, [
     {description, "NIF bindings for XXH3 hash functions implemented in Rust"},
-    {vsn, "0.3.4"},
+    {vsn, "0.3.5"},
     {registered, []},
     {applications, [
         kernel,

diff --git a/src/xxh3.erl b/src/xxh3.erl
@@ -31,7 +31,7 @@
     hash128_with_secret/2
 ]).
 
--include("crates.hrl").
+-include("cargo.hrl").
 
 -opaque xxh3_ref() :: reference().
 
@@ -42,7 +42,7 @@
 -on_load(init/0).
 
 init() ->
-    ?load_nif_from_crate(xxh3, ?crate_xxh3, 0).
+    ?load_nif_from_crate(xxh3, 0).
 
 %% @doc Creates a new 64-bit hasher with default secret.
 %%