y-rb 0.2.0 → 0.3.0

data/ext/yrb/src/lib.rs

@@ -39,61 +39,40 @@ fn init() -> Result<(), Error> {
         .define_private_method("yarray_get", method!(YArray::yarray_get, 1))
         .expect("cannot define private method: yarray_get");
     yarray
-        .define_private_method(
-            "yarray_insert",
-            method!(YArray::yarray_insert, 3)
-        )
+        .define_private_method("yarray_insert", method!(YArray::yarray_insert, 3))
         .expect("cannot define private method: yarray_insert");
     yarray
         .define_private_method(
             "yarray_insert_range",
-            method!(YArray::yarray_insert_range, 3)
+            method!(YArray::yarray_insert_range, 3),
         )
         .expect("cannot define private method: yarray_insert_range");
     yarray
-        .define_private_method(
-            "yarray_length",
-            method!(YArray::yarray_length, 0)
-        )
+        .define_private_method("yarray_length", method!(YArray::yarray_length, 0))
         .expect("cannot define private method: yarray_length");
     yarray
-        .define_private_method(
-            "yarray_observe",
-            method!(YArray::yarray_observe, 1)
-        )
+        .define_private_method("yarray_observe", method!(YArray::yarray_observe, 1))
         .expect("cannot define private method: yarray_observe");
     yarray
-        .define_private_method(
-            "yarray_push_back",
-            method!(YArray::yarray_push_back, 2)
-        )
+        .define_private_method("yarray_push_back", method!(YArray::yarray_push_back, 2))
         .expect("cannot define private method: yarray_push_back");
     yarray
-        .define_private_method(
-            "yarray_push_front",
-            method!(YArray::yarray_push_front, 2)
-        )
+        .define_private_method("yarray_push_front", method!(YArray::yarray_push_front, 2))
         .expect("cannot define private method: yarray_push_front");
     yarray
-        .define_private_method(
-            "yarray_remove",
-            method!(YArray::yarray_remove, 2)
-        )
+        .define_private_method("yarray_remove", method!(YArray::yarray_remove, 2))
         .expect("cannot define private method: yarray_remove");
     yarray
         .define_private_method(
             "yarray_remove_range",
-            method!(YArray::yarray_remove_range, 3)
+            method!(YArray::yarray_remove_range, 3),
         )
         .expect("cannot define private method: yarray_remove_range");
     yarray
         .define_private_method("yarray_to_a", method!(YArray::yarray_to_a, 0))
         .expect("cannot define private method: yarray_to_a");
     yarray
-        .define_private_method(
-            "yarray_unobserve",
-            method!(YArray::yarray_unobserve, 1)
-        )
+        .define_private_method("yarray_unobserve", method!(YArray::yarray_unobserve, 1))
         .expect("cannot define private method: yarray_unobserve");
 
     let ydoc = module
@@ -101,16 +80,10 @@ fn init() -> Result<(), Error> {
         .expect("cannot define class Y::Doc");
     ydoc.define_singleton_method("new", function!(YDoc::ydoc_new, -1))
         .expect("cannot define singleton method: ydoc_new");
-    ydoc.define_private_method(
-        "ydoc_transact",
-        method!(YDoc::ydoc_transact, 0)
-    )
-    .expect("cannot define private method: ydoc_transact");
-    ydoc.define_private_method(
-        "ydoc_encode_diff_v1",
-        method!(YDoc::ydoc_encode_diff_v1, 1)
-    )
-    .expect("cannot define private method: ydoc_encode_diff_v1");
+    ydoc.define_private_method("ydoc_transact", method!(YDoc::ydoc_transact, 0))
+        .expect("cannot define private method: ydoc_transact");
+    ydoc.define_private_method("ydoc_encode_diff_v1", method!(YDoc::ydoc_encode_diff_v1, 1))
+        .expect("cannot define private method: ydoc_encode_diff_v1");
 
     let ymap = module
         .define_class("Map", Default::default())
@@ -118,11 +91,8 @@ fn init() -> Result<(), Error> {
 
     ymap.define_private_method("ymap_clear", method!(YMap::ymap_clear, 1))
         .expect("cannot define private method: ymap_clear");
-    ymap.define_private_method(
-        "ymap_contains",
-        method!(YMap::ymap_contains, 1)
-    )
-    .expect("cannot define private method: ymap_contains");
+    ymap.define_private_method("ymap_contains", method!(YMap::ymap_contains, 1))
+        .expect("cannot define private method: ymap_contains");
     ymap.define_private_method("ymap_each", method!(YMap::ymap_each, 1))
         .expect("cannot define private method: ymap_each");
     ymap.define_private_method("ymap_get", method!(YMap::ymap_get, 1))
@@ -137,11 +107,8 @@ fn init() -> Result<(), Error> {
         .expect("cannot define private method: ymap_size");
     ymap.define_private_method("ymap_to_h", method!(YMap::ymap_to_h, 0))
         .expect("cannot define private method: ymap_to_h");
-    ymap.define_private_method(
-        "ymap_unobserve",
-        method!(YMap::ymap_unobserve, 1)
-    )
-    .expect("cannot define private method: ymap_unobserve");
+    ymap.define_private_method("ymap_unobserve", method!(YMap::ymap_unobserve, 1))
+        .expect("cannot define private method: ymap_unobserve");
 
     let ytransaction = module
         .define_class("Transaction", Default::default())
@@ -150,49 +117,49 @@ fn init() -> Result<(), Error> {
     ytransaction
         .define_private_method(
             "ytransaction_apply_update",
-            method!(YTransaction::ytransaction_apply_update, 1)
+            method!(YTransaction::ytransaction_apply_update, 1),
         )
         .expect("cannot define private method: ytransaction_apply_update");
     ytransaction
         .define_private_method(
             "ytransaction_commit",
-            method!(YTransaction::ytransaction_commit, 0)
+            method!(YTransaction::ytransaction_commit, 0),
         )
         .expect("cannot define private method: ytransaction_commit");
     ytransaction
         .define_private_method(
             "ytransaction_get_array",
-            method!(YTransaction::ytransaction_get_array, 1)
+            method!(YTransaction::ytransaction_get_array, 1),
         )
         .expect("cannot define private method: ytransaction_get_array");
     ytransaction
         .define_private_method(
             "ytransaction_get_map",
-            method!(YTransaction::ytransaction_get_map, 1)
+            method!(YTransaction::ytransaction_get_map, 1),
         )
         .expect("cannot define private method: ytransaction_get_mao");
     ytransaction
         .define_private_method(
             "ytransaction_get_text",
-            method!(YTransaction::ytransaction_get_text, 1)
+            method!(YTransaction::ytransaction_get_text, 1),
         )
         .expect("cannot define private method: ytransaction_get_text");
     ytransaction
         .define_private_method(
             "ytransaction_get_xml_element",
-            method!(YTransaction::ytransaction_get_xml_element, 1)
+            method!(YTransaction::ytransaction_get_xml_element, 1),
         )
         .expect("cannot define private method: ytransaction_get_xml_element");
     ytransaction
         .define_private_method(
             "ytransaction_get_xml_text",
-            method!(YTransaction::ytransaction_get_xml_text, 1)
+            method!(YTransaction::ytransaction_get_xml_text, 1),
         )
         .expect("cannot define private method: ytransaction_get_xml_text");
     ytransaction
         .define_private_method(
             "ytransaction_state_vector",
-            method!(YTransaction::ytransaction_state_vector, 0)
+            method!(YTransaction::ytransaction_state_vector, 0),
         )
         .expect("cannot define private method: ytransaction_state_vector");
 
@@ -207,51 +174,37 @@ fn init() -> Result<(), Error> {
         .define_private_method("ytext_insert", method!(YText::ytext_insert, 3))
         .expect("cannot define private method: ytext_insert");
     ytext
-        .define_private_method(
-            "ytext_insert_embed",
-            method!(YText::ytext_insert_embed, 3)
-        )
+        .define_private_method("ytext_insert_embed", method!(YText::ytext_insert_embed, 3))
         .expect("cannot define private method: ytext_insert_embed");
     ytext
         .define_private_method(
             "ytext_insert_embed_with_attributes",
-            method!(YText::ytext_insert_embed_with_attributes, 4)
+            method!(YText::ytext_insert_embed_with_attributes, 4),
         )
-        .expect(
-            "cannot define private method: ytext_insert_embed_with_attributes"
-        );
+        .expect("cannot define private method: ytext_insert_embed_with_attributes");
     ytext
         .define_private_method(
             "ytext_insert_with_attributes",
-            method!(YText::ytext_insert_with_attributes, 4)
+            method!(YText::ytext_insert_with_attributes, 4),
         )
         .expect("cannot define private method: ytext_insert_with_attributes");
     ytext
         .define_private_method("ytext_length", method!(YText::ytext_length, 0))
         .expect("cannot define private method: ytext_length");
     ytext
-        .define_private_method(
-            "ytext_observe",
-            method!(YText::ytext_observe, 1)
-        )
+        .define_private_method("ytext_observe", method!(YText::ytext_observe, 1))
         .expect("cannot define private method: ytext_observe");
     ytext
         .define_private_method("ytext_push", method!(YText::ytext_push, 2))
         .expect("cannot define private method: ytext_push");
     ytext
-        .define_private_method(
-            "ytext_remove_range",
-            method!(YText::ytext_remove_range, 3)
-        )
+        .define_private_method("ytext_remove_range", method!(YText::ytext_remove_range, 3))
         .expect("cannot define private method: ytext_remove_range");
     ytext
         .define_private_method("ytext_to_s", method!(YText::ytext_to_s, 0))
         .expect("cannot define private method: ytext_to_s");
     ytext
-        .define_private_method(
-            "ytext_unobserve",
-            method!(YText::ytext_unobserve, 1)
-        )
+        .define_private_method("ytext_unobserve", method!(YText::ytext_unobserve, 1))
         .expect("cannot define private method: ytext_unobserve");
 
     let yxml_element = module
@@ -261,127 +214,127 @@ fn init() -> Result<(), Error> {
     yxml_element
         .define_private_method(
             "yxml_element_attributes",
-            method!(YXmlElement::yxml_element_attributes, 0)
+            method!(YXmlElement::yxml_element_attributes, 0),
         )
         .expect("cannot define private method: yxml_element_attributes");
     yxml_element
         .define_private_method(
             "yxml_element_first_child",
-            method!(YXmlElement::yxml_element_first_child, 0)
+            method!(YXmlElement::yxml_element_first_child, 0),
         )
         .expect("cannot define private method: yxml_element_first_child");
     yxml_element
         .define_private_method(
             "yxml_element_get",
-            method!(YXmlElement::yxml_element_get, 1)
+            method!(YXmlElement::yxml_element_get, 1),
         )
         .expect("cannot define private method: yxml_element_get");
     yxml_element
         .define_private_method(
             "yxml_element_get_attribute",
-            method!(YXmlElement::yxml_element_get_attribute, 1)
+            method!(YXmlElement::yxml_element_get_attribute, 1),
         )
         .expect("cannot define private method: yxml_element_get_attribute");
     yxml_element
         .define_private_method(
             "yxml_element_insert_attribute",
-            method!(YXmlElement::yxml_element_insert_attribute, 3)
+            method!(YXmlElement::yxml_element_insert_attribute, 3),
         )
         .expect("cannot define private method: yxml_element_insert_attribute");
     yxml_element
         .define_private_method(
             "yxml_element_insert_element",
-            method!(YXmlElement::yxml_element_insert_element, 3)
+            method!(YXmlElement::yxml_element_insert_element, 3),
         )
         .expect("cannot define private method: yxml_element_insert_element");
     yxml_element
         .define_private_method(
             "yxml_element_insert_text",
-            method!(YXmlElement::yxml_element_insert_text, 2)
+            method!(YXmlElement::yxml_element_insert_text, 2),
         )
         .expect("cannot define private method: yxml_element_insert_text");
     yxml_element
         .define_private_method(
             "yxml_element_next_sibling",
-            method!(YXmlElement::yxml_element_next_sibling, 0)
+            method!(YXmlElement::yxml_element_next_sibling, 0),
         )
         .expect("cannot define private method: yxml_element_next_sibling");
     yxml_element
         .define_private_method(
             "yxml_element_observe",
-            method!(YXmlElement::yxml_element_observe, 1)
+            method!(YXmlElement::yxml_element_observe, 1),
         )
         .expect("cannot define private method: yxml_element_observe");
     yxml_element
         .define_private_method(
             "yxml_element_parent",
-            method!(YXmlElement::yxml_element_parent, 0)
+            method!(YXmlElement::yxml_element_parent, 0),
         )
         .expect("cannot define private method: yxml_element_parent");
     yxml_element
         .define_private_method(
             "yxml_element_prev_sibling",
-            method!(YXmlElement::yxml_element_prev_sibling, 0)
+            method!(YXmlElement::yxml_element_prev_sibling, 0),
         )
         .expect("cannot define private method: yxml_element_prev_sibling");
     yxml_element
         .define_private_method(
             "yxml_element_push_elem_back",
-            method!(YXmlElement::yxml_element_push_element_back, 2)
+            method!(YXmlElement::yxml_element_push_element_back, 2),
         )
         .expect("cannot define private method: yxml_element_push_elem_back");
     yxml_element
         .define_private_method(
             "yxml_element_push_elem_front",
-            method!(YXmlElement::yxml_element_push_element_front, 2)
+            method!(YXmlElement::yxml_element_push_element_front, 2),
         )
         .expect("cannot define private method: yxml_element_push_elem_front");
     yxml_element
         .define_private_method(
             "yxml_element_push_text_back",
-            method!(YXmlElement::yxml_element_push_text_back, 1)
+            method!(YXmlElement::yxml_element_push_text_back, 1),
         )
         .expect("cannot define private method: yxml_element_push_text_back");
     yxml_element
         .define_private_method(
             "yxml_element_push_text_front",
-            method!(YXmlElement::yxml_element_push_text_front, 1)
+            method!(YXmlElement::yxml_element_push_text_front, 1),
         )
         .expect("cannot define private method: yxml_element_push_text_front");
     yxml_element
         .define_private_method(
             "yxml_element_remove_attribute",
-            method!(YXmlElement::yxml_element_remove_attribute, 2)
+            method!(YXmlElement::yxml_element_remove_attribute, 2),
         )
         .expect("cannot define private method: yxml_element_remove_range");
     yxml_element
         .define_private_method(
             "yxml_element_remove_range",
-            method!(YXmlElement::yxml_element_remove_range, 3)
+            method!(YXmlElement::yxml_element_remove_range, 3),
         )
         .expect("cannot define private method: yxml_element_remove_range");
     yxml_element
         .define_private_method(
             "yxml_element_size",
-            method!(YXmlElement::yxml_element_size, 0)
+            method!(YXmlElement::yxml_element_size, 0),
         )
         .expect("cannot define private method: yxml_element_size");
     yxml_element
         .define_private_method(
             "yxml_element_tag",
-            method!(YXmlElement::yxml_element_tag, 0)
+            method!(YXmlElement::yxml_element_tag, 0),
         )
         .expect("cannot define private method: yxml_element_tag");
     yxml_element
         .define_private_method(
             "yxml_element_to_s",
-            method!(YXmlElement::yxml_element_to_s, 0)
+            method!(YXmlElement::yxml_element_to_s, 0),
         )
         .expect("cannot define private method: yxml_element_to_s");
     yxml_element
         .define_private_method(
             "yxml_element_unobserve",
-            method!(YXmlElement::yxml_element_unobserve, 1)
+            method!(YXmlElement::yxml_element_unobserve, 1),
         )
         .expect("cannot define private method: yxml_element_unobserve");
 
@@ -392,164 +345,146 @@ fn init() -> Result<(), Error> {
     yxml_text
         .define_private_method(
             "yxml_text_attributes",
-            method!(YXmlText::yxml_text_attributes, 0)
+            method!(YXmlText::yxml_text_attributes, 0),
         )
         .expect("cannot define private method: yxml_text_attributes");
     yxml_text
-        .define_private_method(
-            "yxml_text_format",
-            method!(YXmlText::yxml_text_format, 4)
-        )
+        .define_private_method("yxml_text_format", method!(YXmlText::yxml_text_format, 4))
         .expect("cannot define private method: yxml_text_format");
     yxml_text
         .define_private_method(
             "yxml_text_get_attribute",
-            method!(YXmlText::yxml_text_get_attribute, 1)
+            method!(YXmlText::yxml_text_get_attribute, 1),
         )
         .expect("cannot define private method: yxml_text_get_attribute");
     yxml_text
-        .define_private_method(
-            "yxml_text_insert",
-            method!(YXmlText::yxml_text_insert, 3)
-        )
+        .define_private_method("yxml_text_insert", method!(YXmlText::yxml_text_insert, 3))
         .expect("cannot define private method: yxml_text_insert");
     yxml_text
         .define_private_method(
             "yxml_text_insert_attribute",
-            method!(YXmlText::yxml_text_insert_attribute, 3)
+            method!(YXmlText::yxml_text_insert_attribute, 3),
         )
         .expect("cannot define private method: yxml_text_insert_attribute");
-    yxml_text.define_private_method("yxml_text_insert_embed_with_attrs", method!(YXmlText::yxml_text_insert_embed_with_attributes, 4)).expect("cannot define private method: yxml_text_insert_embed_with_attributes");
+    yxml_text
+        .define_private_method(
+            "yxml_text_insert_embed_with_attrs",
+            method!(YXmlText::yxml_text_insert_embed_with_attributes, 4),
+        )
+        .expect("cannot define private method: yxml_text_insert_embed_with_attributes");
     yxml_text
         .define_private_method(
             "yxml_text_insert_with_attrs",
-            method!(YXmlText::yxml_text_insert_with_attributes, 4)
+            method!(YXmlText::yxml_text_insert_with_attributes, 4),
         )
-        .expect(
-            "cannot define private method: yxml_text_insert_with_attributes"
-        );
+        .expect("cannot define private method: yxml_text_insert_with_attributes");
     yxml_text
         .define_private_method(
             "yxml_text_insert_embed",
-            method!(YXmlText::yxml_text_insert_embed, 3)
+            method!(YXmlText::yxml_text_insert_embed, 3),
         )
         .expect("cannot define private method: yxml_text_insert_embed");
     yxml_text
-        .define_private_method(
-            "yxml_text_length",
-            method!(YXmlText::yxml_text_length, 0)
-        )
+        .define_private_method("yxml_text_length", method!(YXmlText::yxml_text_length, 0))
         .expect("cannot define private method: yxml_text_length");
     yxml_text
         .define_private_method(
             "yxml_text_next_sibling",
-            method!(YXmlText::yxml_text_next_sibling, 0)
+            method!(YXmlText::yxml_text_next_sibling, 0),
         )
         .expect("cannot define private method: yxml_text_next_sibling");
     yxml_text
-        .define_private_method(
-            "yxml_text_parent",
-            method!(YXmlText::yxml_text_parent, 0)
-        )
+        .define_private_method("yxml_text_parent", method!(YXmlText::yxml_text_parent, 0))
         .expect("cannot define private method: yxml_text_parent");
     yxml_text
         .define_private_method(
             "yxml_text_prev_sibling",
-            method!(YXmlText::yxml_text_prev_sibling, 0)
+            method!(YXmlText::yxml_text_prev_sibling, 0),
         )
         .expect("cannot define private method: yxml_text_prev_sibling");
     yxml_text
-        .define_private_method(
-            "yxml_text_push",
-            method!(YXmlText::yxml_text_push, 2)
-        )
+        .define_private_method("yxml_text_push", method!(YXmlText::yxml_text_push, 2))
         .expect("cannot define private method: yxml_text_push");
     yxml_text
         .define_private_method(
             "yxml_text_remove_range",
-            method!(YXmlText::yxml_text_remove_range, 3)
+            method!(YXmlText::yxml_text_remove_range, 3),
         )
         .expect("cannot define private method: yxml_text_remove_range");
     yxml_text
-        .define_private_method(
-            "yxml_text_to_s",
-            method!(YXmlText::yxml_text_to_s, 0)
-        )
+        .define_private_method("yxml_text_to_s", method!(YXmlText::yxml_text_to_s, 0))
         .expect("cannot define private method: yxml_text_to_s");
 
     let yawareness = module
         .define_class("Awareness", Default::default())
         .expect("cannot define class Y::Awareness");
     yawareness
-        .define_singleton_method(
-            "new",
-            function!(YAwareness::yawareness_new, 0)
-        )
+        .define_singleton_method("new", function!(YAwareness::yawareness_new, 0))
         .expect("cannot define singleton method: yawareness_new");
     yawareness
         .define_private_method(
             "yawareness_apply_update",
-            method!(YAwareness::yawareness_apply_update, 1)
+            method!(YAwareness::yawareness_apply_update, 1),
         )
         .expect("cannot define private method: yawareness_apply_update");
     yawareness
         .define_private_method(
             "yawareness_clean_local_state",
-            method!(YAwareness::yawareness_clean_local_state, 0)
+            method!(YAwareness::yawareness_clean_local_state, 0),
         )
         .expect("cannot define private method: yawareness_clean_local_state");
     yawareness
         .define_private_method(
             "yawareness_clients",
-            method!(YAwareness::yawareness_clients, 0)
+            method!(YAwareness::yawareness_clients, 0),
         )
         .expect("cannot define private method: yawareness_clients");
     yawareness
         .define_private_method(
             "yawareness_client_id",
-            method!(YAwareness::yawareness_client_id, 0)
+            method!(YAwareness::yawareness_client_id, 0),
         )
         .expect("cannot define private method: yawareness_client_id");
     yawareness
         .define_private_method(
             "yawareness_local_state",
-            method!(YAwareness::yawareness_local_state, 0)
+            method!(YAwareness::yawareness_local_state, 0),
         )
         .expect("cannot define private method: yawareness_local_state");
     yawareness
         .define_private_method(
             "yawareness_on_update",
-            method!(YAwareness::yawareness_on_update, 1)
+            method!(YAwareness::yawareness_on_update, 1),
         )
         .expect("cannot define private method: yawareness_on_update");
     yawareness
         .define_private_method(
             "yawareness_remove_on_update",
-            method!(YAwareness::yawareness_remove_on_update, 1)
+            method!(YAwareness::yawareness_remove_on_update, 1),
         )
         .expect("cannot define private method: yawareness_remove_on_update");
     yawareness
         .define_private_method(
             "yawareness_remove_state",
-            method!(YAwareness::yawareness_remove_state, 1)
+            method!(YAwareness::yawareness_remove_state, 1),
         )
         .expect("cannot define private method: yawareness_remove_state");
     yawareness
         .define_private_method(
             "yawareness_set_local_state",
-            method!(YAwareness::yawareness_set_local_state, 1)
+            method!(YAwareness::yawareness_set_local_state, 1),
         )
         .expect("cannot define private method: yawareness_set_local_state");
     yawareness
         .define_private_method(
             "yawareness_update",
-            method!(YAwareness::yawareness_update, 0)
+            method!(YAwareness::yawareness_update, 0),
         )
         .expect("cannot define private method: yawareness_update");
     yawareness
         .define_private_method(
             "yawareness_update_with_clients",
-            method!(YAwareness::yawareness_update_with_clients, 1)
+            method!(YAwareness::yawareness_update_with_clients, 1),
         )
         .expect("cannot define private method: yawareness_update_with_clients");
 
@@ -559,7 +494,7 @@ fn init() -> Result<(), Error> {
     yawareness_update
         .define_private_method(
             "yawareness_update_encode",
-            method!(YAwarenessUpdate::yawareness_update_encode, 0)
+            method!(YAwarenessUpdate::yawareness_update_encode, 0),
         )
         .expect("cannot define private method: yawareness_update_encode");
 

data/ext/yrb/src/utils.rs

@@ -11,9 +11,7 @@ pub(crate) struct TypeConversionError;
 pub(crate) fn indifferent_hash_key(key: Value) -> Option<String> {
     RString::from_value(key)
         .map(|v| v.to_string().unwrap())
-        .or_else(|| {
-            Symbol::from_value(key).map(|v| v.name().unwrap().to_string())
-        })
+        .or_else(|| Symbol::from_value(key).map(|v| v.name().unwrap().to_string()))
 }
 
 pub(crate) fn map_rhash_to_attrs(hash: RHash) -> Result<Attrs, Error> {

data/ext/yrb/src/yany.rs

@@ -38,7 +38,7 @@ impl TryInto<Value> for YAny {
             Any::Number(v) => Ok(Value::from(v)),
             Any::BigInt(v) => Ok(Value::from(v)),
             Any::String(v) => Ok(Value::from(RString::from(v.borrow()))),
-            Any::Buffer(v) => Ok(Value::from(RString::from_slice(v.borrow())))
+            Any::Buffer(v) => Ok(Value::from(RString::from_slice(v.borrow()))),
         };
     }
 }