From a64f1133cb073392631bd3dfc9ff58b85f571d8a Mon Sep 17 00:00:00 2001 From: ghassmo Date: Wed, 16 Mar 2022 09:21:12 +0400 Subject: [PATCH] bin/taud: clean up --- bin/taud/src/main.rs | 30 +++++++++++++++--------------- bin/taud/src/month_tasks.rs | 4 ++-- bin/taud/src/task_info.rs | 8 ++++---- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/bin/taud/src/main.rs b/bin/taud/src/main.rs index 1e0c042b6..8814f3fd5 100644 --- a/bin/taud/src/main.rs +++ b/bin/taud/src/main.rs @@ -105,11 +105,11 @@ impl JsonRpcInterface { } let assign = args[2].as_array(); - if assign.is_some() && assign.unwrap().len() > 0 { + if assign.is_some() && !assign.unwrap().is_empty() { task.set_assign( &assign .unwrap() - .into_iter() + .iter() .filter(|a| a.as_str().is_some()) .map(|a| a.as_str().unwrap().to_string()) .collect(), @@ -117,11 +117,11 @@ impl JsonRpcInterface { } let project = args[3].as_array(); - if project.is_some() && project.unwrap().len() > 0 { + if project.is_some() && !project.unwrap().is_empty() { task.set_project( &project .unwrap() - .into_iter() + .iter() .filter(|p| p.as_str().is_some()) .map(|p| p.as_str().unwrap().to_string()) .collect(), @@ -199,7 +199,7 @@ impl JsonRpcInterface { match self.load_task_by_id(task_id) { Ok(t) => task = t, - Err(e) => return JsonResult::Err(jsonerr(InternalError, Some(e.to_string()), id)), + Err(e) => return JsonResult::Err(jsonerr(InternalError, Some(e), id)), } let mut result = || -> std::result::Result<(), String> { @@ -248,7 +248,7 @@ impl JsonRpcInterface { .ok_or("error parsing assign")? .as_array() .ok_or("invalid value for assign")? - .into_iter() + .iter() .filter(|a| a.as_str().is_some()) .map(|a| a.as_str().unwrap().to_string()) .collect(), @@ -262,7 +262,7 @@ impl JsonRpcInterface { .ok_or("error parsing project")? .as_array() .ok_or("invalid value for project")? - .into_iter() + .iter() .filter(|p| p.as_str().is_some()) .map(|p| p.as_str().unwrap().to_string()) .collect(), @@ -280,7 +280,7 @@ impl JsonRpcInterface { match result() { Ok(()) => JsonResult::Resp(jsonresp(json!(true), id)), - Err(e) => JsonResult::Err(jsonerr(InvalidParams, Some(e.to_string()), id)), + Err(e) => JsonResult::Err(jsonerr(InvalidParams, Some(e), id)), } } @@ -301,10 +301,10 @@ impl JsonRpcInterface { match self.load_task_by_id(task_id) { Ok(t) => task = t, - Err(e) => return JsonResult::Err(jsonerr(InternalError, Some(e.to_string()), id)), + Err(e) => return JsonResult::Err(jsonerr(InternalError, Some(e), id)), } - return JsonResult::Resp(jsonresp(json!(task.get_state()), id)) + JsonResult::Resp(jsonresp(json!(task.get_state()), id)) } // RPCAPI: @@ -329,7 +329,7 @@ impl JsonRpcInterface { match self.load_task_by_id(task_id) { Ok(t) => task = t, - Err(e) => return JsonResult::Err(jsonerr(InternalError, Some(e.to_string()), id)), + Err(e) => return JsonResult::Err(jsonerr(InternalError, Some(e), id)), } task.set_state(state); @@ -375,7 +375,7 @@ impl JsonRpcInterface { match self.load_task_by_id(task_id) { Ok(t) => task = t, - Err(e) => return JsonResult::Err(jsonerr(InternalError, Some(e.to_string()), id)), + Err(e) => return JsonResult::Err(jsonerr(InternalError, Some(e), id)), } task.set_comment(Comment::new(comment_content, comment_author)); @@ -450,7 +450,7 @@ async fn main() -> Result<()> { TermLogger::init(lvl, conf, TerminalMode::Mixed, ColorChoice::Auto)?; - let config: TauConfig = Config::::load(config_path.to_path_buf())?; + let config: TauConfig = Config::::load(config_path)?; let ex = Arc::new(Executor::new()); smol::block_on(ex.run(start(config, ex.clone()))) @@ -475,7 +475,7 @@ mod tests { #[test] fn load_and_save_tasks() -> Result<()> { - let settings = Settings { dataset_path: get_path()?.clone() }; + let settings = Settings { dataset_path: get_path()? }; // load and save TaskInfo /////////////////////// @@ -522,7 +522,7 @@ mod tests { #[test] fn test_activate_task() -> Result<()> { - let settings = Settings { dataset_path: get_path()?.clone() }; + let settings = Settings { dataset_path: get_path()? }; // activate task /////////////////////// diff --git a/bin/taud/src/month_tasks.rs b/bin/taud/src/month_tasks.rs index 4123c20bf..592e33998 100644 --- a/bin/taud/src/month_tasks.rs +++ b/bin/taud/src/month_tasks.rs @@ -36,7 +36,7 @@ impl MonthTasks { let mut tks: Vec = vec![]; for ref_id in self.task_tks.iter() { - tks.push(TaskInfo::load(&ref_id, &self.settings)?); + tks.push(TaskInfo::load(ref_id, &self.settings)?); } Ok(tks) @@ -81,7 +81,7 @@ impl MonthTasks { let mut mt = Self::new(&vec![], settings); mt.set_date(date); mt.save()?; - return Ok(mt) + Ok(mt) } } } diff --git a/bin/taud/src/task_info.rs b/bin/taud/src/task_info.rs index 02ff18111..82edd815c 100644 --- a/bin/taud/src/task_info.rs +++ b/bin/taud/src/task_info.rs @@ -68,7 +68,7 @@ impl TaskInfo { let created_at: Timestamp = get_current_time(); let task_ids: Vec = - MonthTasks::load_current_open_tasks(&settings)?.into_iter().map(|t| t.id).collect(); + MonthTasks::load_current_open_tasks(settings)?.into_iter().map(|t| t.id).collect(); let id: u32 = find_free_id(&task_ids); Ok(Self { @@ -105,9 +105,9 @@ impl TaskInfo { pub fn get_state(&self) -> String { if let Some(ev) = self.events.last() { - return ev.action.clone() + ev.action.clone() } else { - return "open".into() + "open".into() } } @@ -116,7 +116,7 @@ impl TaskInfo { } pub fn get_id(&self) -> u32 { - self.id.clone() + self.id } pub fn get_ref_id(&self) -> String {