From afd6f2f77ae03f2c5377c7cf5f9e4a359bb2e8b8 Mon Sep 17 00:00:00 2001 From: xeruf <27jf@pm.me> Date: Wed, 31 Jul 2024 20:08:33 +0300 Subject: [PATCH] style: reformat --- src/main.rs | 5 ++--- src/task.rs | 9 +++------ src/tasks.rs | 26 ++++++++++++-------------- 3 files changed, 17 insertions(+), 23 deletions(-) diff --git a/src/main.rs b/src/main.rs index 8b9c997..c5f7844 100644 --- a/src/main.rs +++ b/src/main.rs @@ -190,8 +190,7 @@ async fn main() { " {}{}) ", tasks.get_task_path(tasks.get_position()), tasks.get_prompt_suffix() - ) - .italic() + ).italic() ); stdout().flush().unwrap(); match lines.next() { @@ -239,7 +238,7 @@ async fn main() { } } None => { - if arg.is_empty() { + if arg.is_empty() { println!("Available properties: - `id` - `parentid` diff --git a/src/task.rs b/src/task.rs index bda60ce..fc8ce3a 100644 --- a/src/task.rs +++ b/src/task.rs @@ -49,7 +49,7 @@ impl Task { .unwrap_or_else(|| self.get_id().to_string()) } - pub(crate) fn descriptions(&self) -> impl Iterator + '_ { + pub(crate) fn descriptions(&self) -> impl Iterator + '_ { self.props.iter().filter_map(|event| { if event.kind == Kind::TextNote { Some(&event.content) @@ -59,7 +59,7 @@ impl Task { }) } - fn states(&self) -> impl Iterator + '_ { + fn states(&self) -> impl Iterator + '_ { self.props.iter().filter_map(|event| { event.kind.try_into().ok().map(|s| TaskState { name: Some(event.content.clone()).filter(|c| !c.is_empty()), @@ -159,10 +159,7 @@ impl TaskState { } pub(crate) fn matches_label(&self, label: &str) -> bool { self.state == State::Active - || self - .name - .as_ref() - .is_some_and(|n| n.eq_ignore_ascii_case(label)) + || self.name.as_ref().is_some_and(|n| n.eq_ignore_ascii_case(label)) || self.state.to_string().eq_ignore_ascii_case(label) } } diff --git a/src/tasks.rs b/src/tasks.rs index ed08aad..dc363ad 100644 --- a/src/tasks.rs +++ b/src/tasks.rs @@ -198,19 +198,18 @@ impl Tasks { self.traverse_up_from(Some(id)) .take_while(|t| Some(t.event.id) != self.position), false, - ) - .unwrap_or(id.to_string()) + ).unwrap_or(id.to_string()) } // Helpers - fn resolve_tasks<'a>(&self, iter: impl IntoIterator) -> Vec<&Task> { + fn resolve_tasks<'a>(&self, iter: impl IntoIterator) -> Vec<&Task> { self.resolve_tasks_rec(iter, self.depth) } fn resolve_tasks_rec<'a>( &self, - iter: impl IntoIterator, + iter: impl IntoIterator, depth: i8, ) -> Vec<&Task> { iter.into_iter() @@ -266,18 +265,17 @@ impl Tasks { .values() .filter(|t| t.parent_id() == self.position) .map(|t| t.get_id()), - ) - .into_iter() - .filter(|t| { - self.state.as_ref().map_or(true, |state| { - t.state().is_some_and(|t| t.matches_label(state)) - }) && (self.tags.is_empty() - || t.tags.as_ref().map_or(false, |tags| { + ).into_iter() + .filter(|t| { + self.state.as_ref().map_or(true, |state| { + t.state().is_some_and(|t| t.matches_label(state)) + }) && (self.tags.is_empty() + || t.tags.as_ref().map_or(false, |tags| { let mut iter = tags.iter(); self.tags.iter().all(|tag| iter.any(|t| t == tag)) })) - }) - .collect() + }) + .collect() } pub(crate) fn print_tasks(&self) -> Result<(), Error> { @@ -373,7 +371,7 @@ impl Tasks { pub(crate) fn move_to(&mut self, id: Option) { self.view.clear(); - self.tags.clear(); + self.tags.clear(); // TODO unsure if this is needed, needs alternative way to clear if id == self.position { return; }