make clippy happy

Signed-off-by: George Mulhearn <[email protected]>

aries/aries_vcx/src/common/proofs/prover/prover_internal.rs

@@ -41,7 +41,7 @@ pub async fn build_schemas_json_prover(
     let mut rtn: SchemasMap = HashMap::new();
 
     for cred_info in credentials_identifiers {
-        if rtn.get(&cred_info.schema_id).is_none() {
+        if !rtn.contains_key(&cred_info.schema_id) {
             let schema_json = ledger
                 .get_schema(&cred_info.schema_id, None)
                 .await
@@ -157,7 +157,7 @@ pub async fn build_rev_states_json(
             &cred_info.cred_rev_id,
             &cred_info.tails_dir,
         ) {
-            if rtn.get(rev_reg_id).is_none() {
+            if !rtn.contains_key(rev_reg_id) {
                 // Does this make sense in case cred_info's for same rev_reg_ids have different
                 // revocation intervals
                 let (from, to) = if let Some(ref interval) = cred_info.revocation_interval {
@@ -226,8 +226,7 @@ pub fn build_requested_credentials_json(
         if proof_req
             .value()
             .requested_attributes
-            .get(&cred_info.referent)
-            .is_some()
+            .contains_key(&cred_info.referent)
         {
             rtn.requested_attributes.insert(
                 cred_info.referent.to_owned(),
@@ -244,8 +243,7 @@ pub fn build_requested_credentials_json(
         if proof_req
             .value()
             .requested_predicates
-            .get(&cred_info.referent)
-            .is_some()
+            .contains_key(&cred_info.referent)
         {
             rtn.requested_predicates.insert(
                 cred_info.referent.to_owned(),

aries/aries_vcx/src/protocols/connection/generic/mod.rs

@@ -427,7 +427,7 @@ mod connection_serde_tests {
         let wallet = MockWallet;
         let con = make_invitee_requested().await;
         let mut con_data = ConnectionData::new(PW_KEY.to_owned(), AriesDidDoc::default());
-        con_data.did_doc.id = PW_KEY.to_owned();
+        PW_KEY.clone_into(&mut con_data.did_doc.id);
         con_data.did_doc.set_recipient_keys(vec![PW_KEY.to_owned()]);
         con_data.did_doc.set_routing_keys(Vec::new());
 
@@ -476,7 +476,7 @@ mod connection_serde_tests {
         let new_routing_keys = vec![];
 
         let mut con_data = ConnectionData::new(PW_KEY.to_owned(), AriesDidDoc::default());
-        con_data.did_doc.id = PW_KEY.to_owned();
+        PW_KEY.clone_into(&mut con_data.did_doc.id);
         con_data.did_doc.set_recipient_keys(vec![PW_KEY.to_owned()]);
         con_data.did_doc.set_routing_keys(Vec::new());
 

aries/aries_vcx/src/protocols/issuance/holder/state_machine.rs

@@ -168,12 +168,12 @@ impl HolderSM {
         let state = match self.state {
             HolderFullState::Initial(_) => {
                 let mut proposal = proposal;
-                proposal.id = self.thread_id.clone();
+                proposal.id.clone_from(&self.thread_id);
                 HolderFullState::ProposalSet(ProposalSetState::new(proposal))
             }
             HolderFullState::OfferReceived(_) => {
                 let mut proposal = proposal;
-                proposal.id = self.thread_id.clone();
+                proposal.id.clone_from(&self.thread_id);
                 HolderFullState::ProposalSet(ProposalSetState::new(proposal))
             }
             s => {

aries/aries_vcx/src/utils/encryption_envelope.rs

@@ -147,7 +147,7 @@ impl EncryptionEnvelope {
             data =
                 EncryptionEnvelope::wrap_into_forward(wallet, data, &forward_to_key, routing_key)
                     .await?;
-            forward_to_key = routing_key.clone();
+            forward_to_key.clone_from(routing_key);
         }
         Ok(data)
     }

aries/aries_vcx_ledger/src/ledger/indy_vdr_ledger.rs

@@ -693,10 +693,7 @@ pub struct VcxPoolConfig {
 pub fn build_ledger_components(
     pool_config: VcxPoolConfig,
 ) -> VcxLedgerResult<(DefaultIndyLedgerRead, DefaultIndyLedgerWrite)> {
-    let indy_vdr_config = match pool_config.indy_vdr_config {
-        None => PoolConfig::default(),
-        Some(cfg) => cfg,
-    };
+    let indy_vdr_config = pool_config.indy_vdr_config.unwrap_or_default();
     let cache_config = match pool_config.response_cache_config {
         None => InMemoryResponseCacherConfig::builder()
             .ttl(std::time::Duration::from_secs(60))

aries/misc/anoncreds_types/src/utils/query.rs

@@ -284,6 +284,7 @@ where
     }
 }
 
+#[allow(clippy::to_string_trait_impl)] // mimicks upstream anoncreds-rs, allow this to avoid divergence
 impl string::ToString for Query {
     fn to_string(&self) -> String {
         self.to_value().to_string()

aries/misc/legacy/libvdrtools/indy-utils/src/lib.rs

@@ -1,4 +1,5 @@
-#![allow(clippy::not_unsafe_ptr_arg_deref)]
+// allow all clippy warnings, given this is legacy to be removed soon
+#![allow(clippy::all)]
 #[macro_use]
 extern crate serde_json;
 

aries/misc/legacy/libvdrtools/indy-wallet/src/lib.rs

@@ -1,3 +1,5 @@
+// allow all clippy warnings, given this is legacy to be removed soon
+#![allow(clippy::all)]
 use std::{
     collections::{HashMap, HashSet},
     fmt, fs,

aries/misc/test_utils/src/devsetup.rs

@@ -42,10 +42,10 @@ pub mod vdrtools_wallet;
 
 const DEFAULT_AML_LABEL: &str = "eula";
 
-pub fn write_file<P: AsRef<Path>>(file: P, content: &str) -> TestUtilsResult<()>
-where
-    P: std::convert::AsRef<std::ffi::OsStr>,
-{
+pub fn write_file<P: AsRef<Path> + AsRef<std::ffi::OsStr>>(
+    file: P,
+    content: &str,
+) -> TestUtilsResult<()> {
     let path = PathBuf::from(&file);
 
     if let Some(parent_path) = path.parent() {