src/backup/datastore.rs: use new() function to create structs

diff --git a/src/backup/datastore.rs b/src/backup/datastore.rs
index b87f3a08fcfe61f1608e3b64a595cb8045f52e59..1673b1c3796a9946102be69e3cc8cb7a391fb026 100644 (file)
--- a/src/backup/datastore.rs
+++ b/src/backup/datastore.rs
@@ -101,14 +101,9 @@ impl BackupDir {
         let cap = SNAPSHOT_PATH_REGEX.captures(path)
             .ok_or_else(|| format_err!("unable to parse backup snapshot path '{}'", path))?;
 
-
-        Ok(Self {
-            group: BackupGroup {
-                backup_type: cap.get(1).unwrap().as_str().to_owned(),
-                backup_id: cap.get(2).unwrap().as_str().to_owned(),
-            },
-            backup_time: cap.get(3).unwrap().as_str().parse::<DateTime<Local>>()?,
-        })
+        let group = BackupGroup::new(cap.get(1).unwrap().as_str(), cap.get(2).unwrap().as_str());
+        let backup_time = cap.get(3).unwrap().as_str().parse::<DateTime<Local>>()?;
+        Ok(BackupDir::new(group, backup_time))
     }
 
     fn backup_time_to_file_name(backup_time: DateTime<Local>) -> String {
@@ -337,13 +332,7 @@ impl DataStore {
                     })?;
 
                     list.push(BackupInfo {
-                        backup_dir: BackupDir {
-                            group: BackupGroup {
-                                backup_type: backup_type.to_owned(),
-                                backup_id: backup_id.to_owned(),
-                            },
-                            backup_time: dt,
-                        },
+                        backup_dir: BackupDir::new(BackupGroup::new(backup_type, backup_id), dt),
                         files,
                     });