rename ffi_import_labels, drop map(drop), extract is_supported

Author: Sandipmandal25

rust/src/backup/import.rs

@@ -524,7 +524,8 @@ pub(crate) fn cleanup_failed_wallet(metadata: &WalletMetadata) -> Vec<String> {
 
 fn import_labels(id: &WalletId, jsonl: &str) -> Result<(), BackupError> {
     let manager = LabelManager::new(id.clone());
-    manager.import(jsonl).map(drop).map_err(|e| BackupError::Restore(e.to_string()))
+    manager.import(jsonl).map_err(|e| BackupError::Restore(e.to_string()))?;
+    Ok(())
 }
 
 pub(crate) fn restore_wallet_labels(
@@ -542,8 +543,8 @@ pub(crate) fn restore_wallet_labels(
         LabelRestoreBehavior::MarkCloudBackupDirty => import_labels(wallet_id, jsonl),
         LabelRestoreBehavior::PreserveCloudBackupClean => manager
             .import_without_cloud_backup_dirty(jsonl)
-            .map(drop)
-            .map_err(|error| BackupError::Restore(error.to_string())),
+            .map_err(|error| BackupError::Restore(error.to_string()))
+            .map(|_| ()),
     };
 
     match import_result {

rust/src/label_manager.rs

@@ -238,7 +238,7 @@ impl LabelManager {
     }
 
     #[uniffi::method(name = "importLabels")]
-    pub fn _import_labels(
+    pub fn ffi_import_labels(
         &self,
         labels: Arc<Bip329Labels>,
     ) -> Result<LabelParseReport, LabelManagerError> {
@@ -315,17 +315,15 @@ impl LabelManager {
         labels: impl Into<Labels>,
     ) -> Result<LabelParseReport, LabelManagerError> {
         let labels = labels.into();
-        // Count only supported variants — insert_label_with_write_txn silently drops
+        // count only supported variants — insert_label_with_write_txn silently drops
         // PublicKey and ExtendedPublicKey, so labels.len() would overstate the import count.
-        let supported = labels
-            .iter()
-            .filter(|l| {
-                matches!(
-                    l,
-                    Label::Transaction(_) | Label::Address(_) | Label::Input(_) | Label::Output(_)
-                )
-            })
-            .count() as u32;
+        let is_supported = |l: &&Label| {
+            matches!(
+                l,
+                Label::Transaction(_) | Label::Address(_) | Label::Input(_) | Label::Output(_)
+            )
+        };
+        let supported = labels.iter().filter(is_supported).count() as u32;
         let skipped = labels.len() as u32 - supported;
         let report = LabelParseReport { imported: supported, skipped };
         self.save_imported_labels(labels, report, true)