Change splice to accept scalars only

automerge/src/autocommit.rs

@@ -393,8 +393,8 @@ impl Transactable for AutoCommit {
         obj: O,
         pos: usize,
         del: usize,
-        vals: Vec<Value>,
-    ) -> Result<Vec<ExId>, AutomergeError> {
+        vals: Vec<ScalarValue>,
+    ) -> Result<(), AutomergeError> {
         self.ensure_transaction_open();
         let tx = self.transaction.as_mut().unwrap();
         tx.splice(&mut self.doc, obj.as_ref(), pos, del, vals)

automerge/src/transaction/inner.rs

@@ -327,23 +327,19 @@ impl TransactionInner {
         obj: &ExId,
         mut pos: usize,
         del: usize,
-        vals: Vec<Value>,
-    ) -> Result<Vec<ExId>, AutomergeError> {
+        vals: Vec<ScalarValue>,
+    ) -> Result<(), AutomergeError> {
         let obj = doc.exid_to_obj(obj)?;
         for _ in 0..del {
             // del()
             self.local_op(doc, obj, pos.into(), OpType::Del)?;
         }
-        let mut results = Vec::new();
         for v in vals {
             // insert()
-            let id = self.do_insert(doc, obj, pos, v)?;
-            if let Some(id) = id {
-                results.push(doc.id_to_exid(id));
-            }
+            self.do_insert(doc, obj, pos, v)?;
             pos += 1;
         }
-        Ok(results)
+        Ok(())
     }
 }
 

automerge/src/transaction/manual_transaction.rs

@@ -163,8 +163,8 @@ impl<'a> Transactable for Transaction<'a> {
         obj: O,
         pos: usize,
         del: usize,
-        vals: Vec<Value>,
-    ) -> Result<Vec<ExId>, AutomergeError> {
+        vals: Vec<ScalarValue>,
+    ) -> Result<(), AutomergeError> {
         self.inner
             .as_mut()
             .unwrap()

automerge/src/transaction/transactable.rs

@@ -9,11 +9,6 @@ pub trait Transactable {
 
     /// Set the value of property `P` to value `V` in object `obj`.
     ///
-    /// # Returns
-    ///
-    /// The opid of the operation which was created, or None if this operation doesn't change the
-    /// document
-    ///
     /// # Errors
     ///
     /// This will return an error if
@@ -27,12 +22,11 @@ pub trait Transactable {
         value: V,
     ) -> Result<(), AutomergeError>;
 
-    /// Set the value of property `P` to value `V` in object `obj`.
+    /// Set the value of property `P` to the new object `V` in object `obj`.
     ///
     /// # Returns
     ///
-    /// The opid of the operation which was created, or None if this operation doesn't change the
-    /// document
+    /// The id of the object which was created.
     ///
     /// # Errors
     ///
@@ -44,7 +38,7 @@ pub trait Transactable {
         &mut self,
         obj: O,
         prop: P,
-        value: V,
+        object: V,
     ) -> Result<ExId, AutomergeError>;
 
     /// Insert a value into a list at the given index.
@@ -55,7 +49,7 @@ pub trait Transactable {
         value: V,
     ) -> Result<(), AutomergeError>;
 
-    /// Insert a value into a list at the given index.
+    /// Insert an object into a list at the given index.
     fn insert_object<V: Into<ObjType>>(
         &mut self,
         obj: &ExId,
@@ -75,15 +69,13 @@ pub trait Transactable {
     fn del<O: AsRef<ExId>, P: Into<Prop>>(&mut self, obj: O, prop: P)
         -> Result<(), AutomergeError>;
 
-    /// Splice new elements into the given sequence. Returns a vector of the OpIds used to insert
-    /// the new elements.
     fn splice<O: AsRef<ExId>>(
         &mut self,
         obj: O,
         pos: usize,
         del: usize,
-        vals: Vec<Value>,
-    ) -> Result<Vec<ExId>, AutomergeError>;
+        vals: Vec<ScalarValue>,
+    ) -> Result<(), AutomergeError>;
 
     /// Like [`Self::splice`] but for text.
     fn splice_text<O: AsRef<ExId>>(
@@ -92,7 +84,7 @@ pub trait Transactable {
         pos: usize,
         del: usize,
         text: &str,
-    ) -> Result<Vec<ExId>, AutomergeError> {
+    ) -> Result<(), AutomergeError> {
         let mut vals = vec![];
         for c in text.to_owned().graphemes(true) {
             vals.push(c.into());