Merge branch 'master' into ios-update-tos-pp

novasamatech · May 7, 2024 · 3cee52c · 3cee52c
2 parents 128d8f9 + 0c64197
commit 3cee52c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -22,10 +22,4 @@
 /.gitlab-ci.yml @paritytech/ci
 /ios @tetekinandrey @krodak
 /android @Dmitry-Borodin
-/android/src/main/java/io/parity/signer/ui @tetekinandrey @Dmitry-Borodin
-/android/src/main/java/io/parity/signer/screens @tetekinandrey @Dmitry-Borodin
-/android/src/main/java/io/parity/signer/components @tetekinandrey @Dmitry-Borodin
-/android/src/main/java/io/parity/signer/components2 @tetekinandrey @Dmitry-Borodin
-/android/src/main/java/io/parity/signer/bottmsheets @tetekinandrey @Dmitry-Borodin
-/rust @prybalko
 /rust/signer/src/signer.udl @Dmitry-Borodin @krodak
diff --git a/rust/db_handling/src/interface_signer.rs b/rust/db_handling/src/interface_signer.rs
@@ -85,13 +85,13 @@ pub fn get_all_seed_names_with_identicons(
                 .entry(address_details.seed_name.to_string())
                 .and_modify(|e| *e += 1)
                 .or_insert(1);
-            if data_set.get(&address_details.seed_name).is_none() {
+            if !data_set.contains_key(&address_details.seed_name) {
                 data_set.insert(address_details.seed_name.to_string(), Identicon::default());
             }
         }
     }
     for x in names_phone_knows.iter() {
-        if data_set.get(x).is_none() {
+        if !data_set.contains_key(x) {
             data_set.insert(x.to_string(), Identicon::default());
         }
     }

diff --git a/rust/generate_message/src/helpers.rs b/rust/generate_message/src/helpers.rs
@@ -779,7 +779,7 @@ pub fn update_modify_encryption_specs(
     specs.title =
         optional_signer_title_override.unwrap_or(format!("{}-{}", specs.name, encryption.show()));
 
-    specs.encryption = encryption.to_owned();
+    encryption.clone_into(&mut specs.encryption);
 
     Ok(())
 }

diff --git a/rust/transaction_signing/src/sign_transaction.rs b/rust/transaction_signing/src/sign_transaction.rs
@@ -35,6 +35,7 @@ impl SignatureAndChecksum {
     }
 }
 
+#[allow(clippy::to_string_trait_impl)]
 impl ToString for SignatureAndChecksum {
     fn to_string(&self) -> String {
         match self.signature_type {