gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

refactor annotations to handle invalid strings

Browse Source
This commit is contained in:
Dustin J. Mitchell
2022-02-12 00:26:57 +00:00
parent 7ebdaa761c
commit 76cbc2880b
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/src/task.rs
View File

@@ -6,7 +6,7 @@ use std::convert::TryFrom;
use std::ops::Deref;
use std::ptr::NonNull;
use std::str::FromStr;
use taskchampion::{Tag, Task, TaskMut};
use taskchampion::{Annotation, Tag, Task, TaskMut};
/// A task, as publicly exposed by this library.
///
@@ -331,7 +331,10 @@ pub unsafe extern "C" fn tc_task_get_annotations<'a>(task: *mut TCTask) -> TCAnn
wrap(task, |task| {
let vec: Vec<TCAnnotation> = task
.get_annotations()
.map(|a| TCAnnotation::as_ctype(a))
.map(|a| {
let description = TCString::from(a.description);
TCAnnotation::as_ctype((a.entry, description))
})
.collect();
TCAnnotationList::return_val(vec)
})
@@ -513,11 +516,13 @@ pub unsafe extern "C" fn tc_task_add_annotation(
annotation: *mut TCAnnotation,
) -> TCResult {
// SAFETY: see TCAnnotation docstring
let ann = unsafe { TCAnnotation::take_from_arg(annotation, TCAnnotation::default()) };
let (entry, description) =
unsafe { TCAnnotation::take_from_arg(annotation, TCAnnotation::default()) };
wrap_mut(
task,
|task| {
task.add_annotation(ann)?;
let description = description.into_string()?;
task.add_annotation(Annotation { entry, description })?;
Ok(TCResult::Ok)
},
TCResult::Error,