bump wasm-bindgen & use immutable ref for map (#22)

Cargo.toml

@@ -17,7 +17,7 @@ js-sys = "0.3.69"
 rosu-mods = { version = "0.1.0", default-features = false, features = ["serde"] }
 rosu-pp = "1.1.0"
 serde = { version = "1.0.197", features = ["derive"] }
-wasm-bindgen = "0.2.84"
+wasm-bindgen = "0.2.95"
 
 [dev-dependencies]
 wasm-bindgen-test = "0.3.34"

src/args/beatmap.rs

@@ -3,7 +3,7 @@ use std::fmt::{Formatter, Result as FmtResult};
 use rosu_mods::GameMods;
 use rosu_pp::model::beatmap::BeatmapAttributesBuilder;
 use serde::de;
-use wasm_bindgen::{__rt::RefMut, prelude::wasm_bindgen};
+use wasm_bindgen::{__rt::RcRef, prelude::wasm_bindgen};
 
 use crate::{beatmap::JsBeatmap, mode::JsGameMode, util};
 
@@ -100,7 +100,7 @@ pub struct BeatmapAttributesArgs {
     #[serde(default)]
     pub is_convert: bool,
     #[serde(default, deserialize_with = "deser_maybe_map")]
-    pub map: Option<RefMut<'static, JsBeatmap>>,
+    pub map: Option<RcRef<JsBeatmap>>,
 }
 
 impl BeatmapAttributesArgs {
@@ -144,11 +144,11 @@ impl BeatmapAttributesArgs {
 
 fn deser_maybe_map<'de, D: de::Deserializer<'de>>(
     d: D,
-) -> Result<Option<RefMut<'static, JsBeatmap>>, D::Error> {
+) -> Result<Option<RcRef<JsBeatmap>>, D::Error> {
     struct MaybeMapVisitor;
 
     impl<'de> de::Visitor<'de> for MaybeMapVisitor {
-        type Value = Option<RefMut<'static, JsBeatmap>>;
+        type Value = Option<RcRef<JsBeatmap>>;
 
         fn expecting(&self, f: &mut Formatter) -> FmtResult {
             f.write_str("an optional Beatmap")

src/args/performance.rs

@@ -4,7 +4,7 @@ use rosu_pp::{
     Performance,
 };
 use serde::de;
-use wasm_bindgen::{__rt::RefMut, prelude::wasm_bindgen, JsValue};
+use wasm_bindgen::{__rt::RcRef, prelude::wasm_bindgen, JsValue};
 
 use crate::{
     attributes::{difficulty::JsDifficultyAttributes, performance::JsPerformanceAttributes},
@@ -202,7 +202,7 @@ const _: &'static str = r#"/**
 export type MapOrAttributes = DifficultyAttributes | PerformanceAttributes | Beatmap;"#;
 
 pub enum MapOrAttrs {
-    Map(RefMut<'static, JsBeatmap>),
+    Map(RcRef<JsBeatmap>),
     Attrs(DifficultyAttributes),
 }
 

src/beatmap.rs

@@ -11,7 +11,7 @@ use rosu_pp::{
     Beatmap,
 };
 use serde::de;
-use wasm_bindgen::{__rt::RefMut, convert::RefMutFromWasmAbi, prelude::wasm_bindgen};
+use wasm_bindgen::{__rt::RcRef, convert::RefFromWasmAbi, prelude::wasm_bindgen};
 
 use crate::{
     args::beatmap::{BeatmapContent, JsBeatmapContent},
@@ -127,9 +127,7 @@ impl JsBeatmap {
 }
 
 impl JsBeatmap {
-    pub fn deserialize<'de, D: de::Deserializer<'de>>(
-        d: D,
-    ) -> Result<RefMut<'static, Self>, D::Error> {
+    pub fn deserialize<'de, D: de::Deserializer<'de>>(d: D) -> Result<RcRef<Self>, D::Error> {
         struct BeatmapField;
 
         impl BeatmapField {
@@ -146,7 +144,7 @@ impl JsBeatmap {
         struct BeatmapVisitor;
 
         impl<'de> de::Visitor<'de> for BeatmapVisitor {
-            type Value = RefMut<'static, JsBeatmap>;
+            type Value = RcRef<JsBeatmap>;
 
             fn expecting(&self, f: &mut Formatter) -> FmtResult {
                 f.write_str("a Beatmap")
@@ -156,7 +154,7 @@ impl JsBeatmap {
                 map.next_key::<BeatmapField>()?;
 
                 let ptr_u32 = map.next_value::<u32>()?;
-                let instance_ref = unsafe { JsBeatmap::ref_mut_from_abi(ptr_u32) };
+                let instance_ref = unsafe { JsBeatmap::ref_from_abi(ptr_u32) };
 
                 Ok(instance_ref)
             }