use RefCell for replica, more consistent rust methods

lib/src/replica.rs

@@ -1,4 +1,5 @@
 use crate::{result::TCResult, status::TCStatus, string::TCString, task::TCTask, uuid::TCUuid};
+use std::cell::{RefCell, RefMut};
 use taskchampion::{Replica, StorageConfig, Uuid};
 
 /// A replica represents an instance of a user's task data, providing an easy interface
@@ -6,8 +7,7 @@ use taskchampion::{Replica, StorageConfig, Uuid};
 ///
 /// TCReplicas are not threadsafe.
 pub struct TCReplica {
-    // TODO: make this a RefCell so that it can be take()n when holding a mut ref
+    inner: RefCell<Replica>,
-    inner: Replica,
     error: Option<TCString<'static>>,
 }
 
@@ -19,9 +19,23 @@ impl TCReplica {
     /// The pointer must not be NULL.  It is the caller's responsibility to ensure that the
     /// lifetime assigned to the reference and the lifetime of the TCReplica itself do not outlive
     /// the lifetime promised by C.
-    pub(crate) unsafe fn from_arg_ref<'a>(tcstring: *mut TCReplica) -> &'a mut Self {
+    pub(crate) unsafe fn from_arg_ref<'a>(tcreplica: *mut TCReplica) -> &'a mut Self {
-        debug_assert!(!tcstring.is_null());
+        debug_assert!(!tcreplica.is_null());
-        &mut *tcstring
+        &mut *tcreplica
+    }
+
+    /// Convert this to a return value for handing off to C.
+    pub(crate) fn return_val(self) -> *mut TCReplica {
+        Box::into_raw(Box::new(self))
+    }
+}
+
+impl From<Replica> for TCReplica {
+    fn from(rep: Replica) -> TCReplica {
+        TCReplica {
+            inner: RefCell::new(rep),
+            error: None,
+        }
     }
 }
 
@@ -29,17 +43,18 @@ fn err_to_tcstring(e: impl std::string::ToString) -> TCString<'static> {
     TCString::from(e.to_string())
 }
 
-/// Utility function to allow using `?` notation to return an error value.
+/// Utility function to allow using `?` notation to return an error value.  This makes
+/// a mutable borrow, because most Replica methods require a `&mut`.
 fn wrap<'a, T, F>(rep: *mut TCReplica, f: F, err_value: T) -> T
 where
-    F: FnOnce(&mut Replica) -> anyhow::Result<T>,
+    F: FnOnce(RefMut<'_, Replica>) -> anyhow::Result<T>,
 {
     // SAFETY:
     //  - rep is not null (promised by caller)
     //  - rep outlives 'a (promised by caller)
     let rep: &'a mut TCReplica = unsafe { TCReplica::from_arg_ref(rep) };
     rep.error = None;
-    match f(&mut rep.inner) {
+    match f(rep.inner.borrow_mut()) {
         Ok(v) => v,
         Err(e) => {
             rep.error = Some(err_to_tcstring(e));
@@ -55,10 +70,7 @@ pub extern "C" fn tc_replica_new_in_memory() -> *mut TCReplica {
     let storage = StorageConfig::InMemory
         .into_storage()
         .expect("in-memory always succeeds");
-    Box::into_raw(Box::new(TCReplica {
+    TCReplica::from(Replica::new(storage)).return_val()
-        inner: Replica::new(storage),
-        error: None,
-    }))
 }
 
 /// Create a new TCReplica with an on-disk database having the given filename. The filename must
@@ -90,10 +102,7 @@ pub extern "C" fn tc_replica_new_on_disk<'a>(
         }
     };
 
-    Box::into_raw(Box::new(TCReplica {
+    TCReplica::from(Replica::new(storage)).return_val()
-        inner: Replica::new(storage),
-        error: None,
-    }))
 }
 
 // TODO: tc_replica_all_tasks
@@ -108,10 +117,10 @@ pub extern "C" fn tc_replica_new_on_disk<'a>(
 pub extern "C" fn tc_replica_get_task(rep: *mut TCReplica, uuid: TCUuid) -> *mut TCTask {
     wrap(
         rep,
-        |rep| {
+        |mut rep| {
             let uuid: Uuid = uuid.into();
             if let Some(task) = rep.get_task(uuid)? {
-                Ok(TCTask::return_val(task))
+                Ok(TCTask::from(task).return_val())
             } else {
                 Ok(std::ptr::null_mut())
             }
@@ -137,9 +146,9 @@ pub extern "C" fn tc_replica_new_task(
     let description = unsafe { TCString::from_arg(description) };
     wrap(
         rep,
-        |rep| {
+        |mut rep| {
             let task = rep.new_task(status.into(), description.as_str()?.to_string())?;
-            Ok(TCTask::return_val(task))
+            Ok(TCTask::from(task).return_val())
         },
         std::ptr::null_mut(),
     )
@@ -155,10 +164,10 @@ pub extern "C" fn tc_replica_import_task_with_uuid(
 ) -> *mut TCTask {
     wrap(
         rep,
-        |rep| {
+        |mut rep| {
             let uuid: Uuid = uuid.into();
             let task = rep.import_task_with_uuid(uuid)?;
-            Ok(TCTask::return_val(task))
+            Ok(TCTask::from(task).return_val())
         },
         std::ptr::null_mut(),
     )
@@ -174,7 +183,7 @@ pub extern "C" fn tc_replica_import_task_with_uuid(
 pub extern "C" fn tc_replica_undo<'a>(rep: *mut TCReplica) -> TCResult {
     wrap(
         rep,
-        |rep| {
+        |mut rep| {
             Ok(if rep.undo()? {
                 TCResult::True
             } else {
@@ -208,7 +217,5 @@ pub extern "C" fn tc_replica_free(rep: *mut TCReplica) {
     drop(unsafe { Box::from_raw(rep) });
 }
 
-/*
+// TODO: tc_replica_rebuild_working_set
- * - tc_replica_rebuild_working_set
+// TODO: tc_replica_add_undo_point
- * - tc_replica_add_undo_point
- */

lib/src/task.rs

@@ -17,14 +17,20 @@ impl TCTask {
     /// The pointer must not be NULL.  It is the caller's responsibility to ensure that the
     /// lifetime assigned to the reference and the lifetime of the TCTask itself do not outlive
     /// the lifetime promised by C.
-    pub(crate) unsafe fn from_arg_ref<'a>(tcstring: *const TCTask) -> &'a Self {
+    pub(crate) unsafe fn from_arg_ref<'a>(tctask: *const TCTask) -> &'a Self {
-        debug_assert!(!tcstring.is_null());
+        debug_assert!(!tctask.is_null());
-        &*tcstring
+        &*tctask
     }
 
-    /// Convert this to a return value for handing off to C.
+    /// Convert a TCTask to a return value for handing off to C.
-    pub(crate) fn return_val(task: Task) -> *mut TCTask {
+    pub(crate) fn return_val(self) -> *mut TCTask {
-        Box::into_raw(Box::new(TCTask { inner: task }))
+        Box::into_raw(Box::new(self))
+    }
+}
+
+impl From<Task> for TCTask {
+    fn from(task: Task) -> TCTask {
+        TCTask { inner: task }
     }
 }
 
@@ -49,10 +55,8 @@ pub extern "C" fn tc_task_get_status<'a>(task: *const TCTask) -> TCStatus {
     task.get_status().into()
 }
 
-/* TODO
+// TODO: into_mut
- * into_mut
+// TODO: get_taskmap
- * get_taskmap
- */
 
 /// Get a task's description, or NULL if the task cannot be represented as a C string (e.g., if it
 /// contains embedded NUL characters).
@@ -66,19 +70,17 @@ pub extern "C" fn tc_task_get_description<'a>(task: *const TCTask) -> *mut TCStr
     descr.return_val()
 }
 
-/* TODO
+// TODO: :get_wait
- * get_wait
+// TODO: :is_waiting
- * is_waiting
+// TODO: :is_active
- * is_active
+// TODO: :has_tag
- * has_tag
+// TODO: :get_tags
- * get_tags
+// TODO: :get_annotations
- * get_annotations
+// TODO: :get_uda
- * get_uda
+// TODO: :get_udas
- * get_udas
+// TODO: :get_legacy_uda
- * get_legacy_uda
+// TODO: :get_legacy_udas
- * get_legacy_udas
+// TODO: :get_modified
- * get_modified
- */
 
 /// Free a task.  The given task must not be NULL.  The task must not be used after this function
 /// returns, and must not be freed more than once.

lib/taskchampion.h

@@ -1,6 +1,5 @@
 #include <stdbool.h>
 #include <stdint.h>
-#define TC_UUID_STRING_BYTES 36
 
 /**
  * Length, in bytes, of the string representation of a UUID (without NUL terminator)