cleanup: merge endtime into TaskState

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2020-08-13 14:30:17 +02:00
parent 97af919530
commit 77bd2a469c
5 changed files with 81 additions and 64 deletions
--- a/src/api2/types/mod.rs
+++ b/src/api2/types/mod.rs
@ -595,7 +595,7 @@ impl From<crate::server::TaskListInfo> for TaskListItem {
    fn from(info: crate::server::TaskListInfo) -> Self {
        let (endtime, status) = info
            .state
-            .map_or_else(|| (None, None), |(a,b)| (Some(a), Some(b.to_string())));
+            .map_or_else(|| (None, None), |a| (Some(a.endtime()), Some(a.to_string())));

        TaskListItem {
            upid: info.upid_str,