Update yrs v0.18.0

Author: davidbrochart

Cargo.toml

@@ -8,7 +8,7 @@ name = "pycrdt"
 crate-type = ["cdylib"]
 
 [dependencies]
-yrs = "0.17.4"
+yrs = "0.18.0"
 
 [dependencies.pyo3]
 version = "0.20.2"

src/array.rs

@@ -8,6 +8,7 @@ use yrs::{
     Doc as _Doc,
     DeepObservable,
     Observable,
+    Subscription,
     TransactionMut,
 };
 use yrs::types::ToJson;
@@ -124,40 +125,42 @@ impl Array {
     }
 
     pub fn observe(&mut self, f: PyObject) -> PyResult<u32> {
-        let id: u32 = self.array
+        let sub = self.array
             .observe(move |txn, e| {
                 Python::with_gil(|py| {
                     let event = ArrayEvent::new(e, txn);
                     if let Err(err) = f.call1(py, (event,)) {
                         err.restore(py)
                     }
                 })
-            })
-            .into();
+            });
+        let id: u32 = (&sub as *const Subscription) as u32;
         Ok(id)
     }
 
     pub fn observe_deep(&mut self, f: PyObject) -> PyResult<u32> {
-        let id: u32 = self.array
+        let sub = self.array
             .observe_deep(move |txn, events| {
                 Python::with_gil(|py| {
                     let events = events_into_py(txn, events);
                     if let Err(err) = f.call1(py, (events,)) {
                         err.restore(py)
                     }
                 })
-            })
-            .into();
+            });
+        let id: u32 = (&sub as *const Subscription) as u32;
         Ok(id)
     }
 
     pub fn unobserve(&mut self, subscription_id: u32) -> PyResult<()> {
-        self.array.unobserve(subscription_id);
+        let sub = subscription_id as *mut Subscription;
+        drop(unsafe { Box::from_raw(sub) });
         Ok(())
     }
 
     pub fn unobserve_deep(&mut self, subscription_id: u32) -> PyResult<()> {
-        self.array.unobserve_deep(subscription_id);
+        let sub = subscription_id as *mut Subscription;
+        drop(unsafe { Box::from_raw(sub) });
         Ok(())
     }
 }

src/doc.rs

@@ -8,6 +8,7 @@ use yrs::{
     TransactionCleanupEvent,
     SubdocsEvent as _SubdocsEvent,
     StateVector,
+    Subscription,
     Update,
 };
 use yrs::updates::encoder::Encode;
@@ -113,7 +114,7 @@ impl Doc {
     }
 
     pub fn observe(&mut self, f: PyObject) -> PyResult<u32> {
-        let id: u32 = self.doc
+        let sub = self.doc
             .observe_transaction_cleanup(move |txn, event| {
                 Python::with_gil(|py| {
                     let event = TransactionEvent::new(event, txn);
@@ -122,13 +123,13 @@ impl Doc {
                     }
                 })
             })
-            .unwrap()
-            .into();
+            .unwrap();
+        let id: u32 = (&sub as *const Subscription) as u32;
         Ok(id)
     }
 
     pub fn observe_subdocs(&mut self, f: PyObject) -> PyResult<u32> {
-        let id: u32 = self.doc
+        let sub = self.doc
             .observe_subdocs(move |_, event| {
                 Python::with_gil(|py| {
                     let event = SubdocsEvent::new(event);
@@ -137,8 +138,8 @@ impl Doc {
                     }
                 })
             })
-            .unwrap()
-            .into();
+            .unwrap();
+        let id: u32 = (&sub as *const Subscription) as u32;
         Ok(id)
     }
 }

src/map.rs

@@ -8,6 +8,7 @@ use yrs::{
     Map as _Map,
     DeepObservable,
     Observable,
+    Subscription,
     TransactionMut,
 };
 use yrs::types::ToJson;
@@ -129,40 +130,42 @@ impl Map {
     }
 
     pub fn observe(&mut self, f: PyObject) -> PyResult<u32> {
-        let id: u32 = self.map
+        let sub = self.map
             .observe(move |txn, e| {
                 Python::with_gil(|py| {
                     let e = MapEvent::new(e, txn);
                     if let Err(err) = f.call1(py, (e,)) {
                         err.restore(py)
                     }
                 })
-            })
-            .into();
+            });
+        let id: u32 = (&sub as *const Subscription) as u32;
         Ok(id)
     }
 
     pub fn observe_deep(&mut self, f: PyObject) -> PyResult<u32> {
-        let id: u32 = self.map
+        let sub = self.map
             .observe_deep(move |txn, events| {
                 Python::with_gil(|py| {
                     let events = events_into_py(txn, events);
                     if let Err(err) = f.call1(py, (events,)) {
                         err.restore(py)
                     }
                 })
-            })
-            .into();
+            });
+        let id: u32 = (&sub as *const Subscription) as u32;
         Ok(id)
     }
 
     pub fn unobserve(&mut self, subscription_id: u32) -> PyResult<()> {
-        self.map.unobserve(subscription_id);
+        let sub = subscription_id as *mut Subscription;
+        drop(unsafe { Box::from_raw(sub) });
         Ok(())
     }
 
     pub fn unobserve_deep(&mut self, subscription_id: u32) -> PyResult<()> {
-        self.map.unobserve_deep(subscription_id);
+        let sub = subscription_id as *mut Subscription;
+        drop(unsafe { Box::from_raw(sub) });
         Ok(())
     }
 }

src/text.rs

@@ -3,6 +3,7 @@ use pyo3::types::{PyList, PyString};
 use yrs::{
     GetString,
     Observable,
+    Subscription,
     TextRef,
     Text as _Text,
     TransactionMut,
@@ -58,20 +59,21 @@ impl Text {
     }
 
     fn observe(&mut self, f: PyObject) -> PyResult<u32> {
-        let id: u32 = self.text.observe(move |txn, e| {
+        let sub = self.text.observe(move |txn, e| {
             Python::with_gil(|py| {
                 let e = TextEvent::new(e, txn);
                 if let Err(err) = f.call1(py, (e,)) {
                     err.restore(py)
                 }
             });
-        })
-        .into();
+        });
+        let id: u32 = (&sub as *const Subscription) as u32;
         Ok(id)
     }
 
     fn unobserve(&self, subscription_id: u32) -> PyResult<()> {
-        self.text.unobserve(subscription_id);
+        let sub = subscription_id as *mut Subscription;
+        drop(unsafe { Box::from_raw(sub) });
         Ok(())
     }
 }