summaryrefslogtreecommitdiff
path: root/legacy_data/src/data/vault/mapping_share.rs
diff options
context:
space:
mode:
Diffstat (limited to 'legacy_data/src/data/vault/mapping_share.rs')
-rw-r--r--legacy_data/src/data/vault/mapping_share.rs8
1 files changed, 3 insertions, 5 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),
),
)),