Update rustler and xxhash-rust to latest versions

.github/workflows/main.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        otp: [21, 22, 23, 24, 25, 26]
+        otp: [21, 22, 23, 24, 25, 26, 27]
         rust: [1.56.0, stable]
 
     container:

native/xxh3/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "xxh3"
-version = "0.3.5"
+version = "0.3.6"
 authors = []
 edition = "2018"
 
@@ -10,5 +10,5 @@ path = "src/lib.rs"
 crate-type = ["dylib"]
 
 [dependencies]
-rustler = "0.29.1"
-xxhash-rust = { version = "0.8.6", features = ["xxh3"] }
+rustler = "0.35.0"
+xxhash-rust = { version = "0.8.12", features = ["xxh3"] }

native/xxh3/src/lib.rs

@@ -1,59 +1,48 @@
-use rustler::resource::ResourceArc;
 use rustler::types::atom::{self, Atom};
 use rustler::types::binary::{Binary, OwnedBinary};
-use rustler::{Env, Error, Term};
+use rustler::{Error, Resource, ResourceArc};
 use std::convert::TryInto;
 use std::io::Write;
 use std::sync::Mutex;
 use xxhash_rust::xxh3::{self, Xxh3};
 
-struct Xxh3Resource {
-    pub stream: Mutex<Xxh3>,
-}
+struct Xxh3Resource(Mutex<Xxh3>);
 
-fn on_load(env: Env, _info: Term) -> bool {
-    rustler::resource!(Xxh3Resource, env);
-    true
-}
+#[rustler::resource_impl]
+impl Resource for Xxh3Resource {}
 
 #[rustler::nif]
 fn new() -> ResourceArc<Xxh3Resource> {
-    ResourceArc::new(Xxh3Resource {
-        stream: Mutex::new(Xxh3::new()),
-    })
+    ResourceArc::new(Xxh3Resource(Mutex::new(Xxh3::new())))
 }
 
 #[rustler::nif(name = "new")]
 fn new_with_seed(seed: u64) -> ResourceArc<Xxh3Resource> {
-    ResourceArc::new(Xxh3Resource {
-        stream: Mutex::new(Xxh3::with_seed(seed)),
-    })
+    ResourceArc::new(Xxh3Resource(Mutex::new(Xxh3::with_seed(seed))))
 }
 
 #[rustler::nif]
 fn new_with_secret(secret: Binary) -> Result<ResourceArc<Xxh3Resource>, Error> {
-    Ok(ResourceArc::new(Xxh3Resource {
-        stream: Mutex::new(Xxh3::with_secret(
-            secret.as_slice().try_into().map_err(|_| Error::BadArg)?,
-        )),
-    }))
+    Ok(ResourceArc::new(Xxh3Resource(Mutex::new(
+        Xxh3::with_secret(secret.as_slice().try_into().map_err(|_| Error::BadArg)?),
+    ))))
 }
 
 #[rustler::nif]
 fn update(resource: ResourceArc<Xxh3Resource>, data: Binary) -> Atom {
-    resource.stream.try_lock().unwrap().update(data.as_slice());
+    resource.0.lock().unwrap().update(data.as_slice());
     atom::ok()
 }
 
 #[rustler::nif]
 fn reset(resource: ResourceArc<Xxh3Resource>) -> Atom {
-    resource.stream.try_lock().unwrap().reset();
+    resource.0.lock().unwrap().reset();
     atom::ok()
 }
 
 #[rustler::nif]
 fn digest(resource: ResourceArc<Xxh3Resource>) -> u64 {
-    resource.stream.try_lock().unwrap().digest()
+    resource.0.lock().unwrap().digest()
 }
 
 #[rustler::nif]
@@ -87,20 +76,4 @@ fn hash128_with_secret_bin(data: Binary, secret: Binary) -> OwnedBinary {
     binary
 }
 
-rustler::init!(
-    "xxh3",
-    [
-        new,
-        new_with_seed,
-        new_with_secret,
-        update,
-        reset,
-        digest,
-        hash64,
-        hash64_with_seed,
-        hash64_with_secret,
-        hash128_with_seed_bin,
-        hash128_with_secret_bin
-    ],
-    load = on_load
-);
+rustler::init!("xxh3");

src/xxh3.app.src

@@ -1,6 +1,6 @@
 {application, xxh3, [
     {description, "NIF bindings for XXH3 hash functions implemented in Rust"},
-    {vsn, "0.3.5"},
+    {vsn, "0.3.6"},
     {registered, []},
     {applications, [
         kernel,