diff options
Diffstat (limited to 'legacy_data/src/data/vault')
| -rw-r--r-- | legacy_data/src/data/vault/mapping_share.rs | 8 | ||||
| -rw-r--r-- | legacy_data/src/data/vault/vault_config.rs | 12 |
2 files changed, 9 insertions, 11 deletions
diff --git a/legacy_data/src/data/vault/mapping_share.rs b/legacy_data/src/data/vault/mapping_share.rs index 59cd6ba..2635b48 100644 --- a/legacy_data/src/data/vault/mapping_share.rs +++ b/legacy_data/src/data/vault/mapping_share.rs @@ -294,12 +294,11 @@ impl<'a> Sheet<'a> { } // Check for duplicate IDs - if let Some(id_mapping) = self.id_mapping() { - if id_mapping.contains_key(&metadata.id) { + if let Some(id_mapping) = self.id_mapping() + && id_mapping.contains_key(&metadata.id) { conflicts.duplicate_file.push(mapping.clone()); continue; } - } } conflicts @@ -411,8 +410,7 @@ impl Share { match fs::remove_file(path).await { Err(err) => Err(( self, - Error::new( - std::io::ErrorKind::Other, + Error::other( format!("Failed to delete share file: {}", err), ), )), diff --git a/legacy_data/src/data/vault/vault_config.rs b/legacy_data/src/data/vault/vault_config.rs index caa8552..156083b 100644 --- a/legacy_data/src/data/vault/vault_config.rs +++ b/legacy_data/src/data/vault/vault_config.rs @@ -52,18 +52,18 @@ pub enum BehaviourEnabled { No, } -impl Into<bool> for ServiceEnabled { - fn into(self) -> bool { - match self { +impl From<ServiceEnabled> for bool { + fn from(val: ServiceEnabled) -> Self { + match val { ServiceEnabled::Enable => true, ServiceEnabled::Disable => false, } } } -impl Into<bool> for BehaviourEnabled { - fn into(self) -> bool { - match self { +impl From<BehaviourEnabled> for bool { + fn from(val: BehaviourEnabled) -> Self { + match val { BehaviourEnabled::Yes => true, BehaviourEnabled::No => false, } |