crypto: Fix some clippy warnings.

master
Damir Jelić 2020-10-30 14:38:29 +01:00
parent b67cd4ddd2
commit b27f1b0e34
2 changed files with 3 additions and 3 deletions

View File

@ -804,7 +804,7 @@ pub(crate) mod test {
let second = Device { let second = Device {
inner: second, inner: second,
verification_machine, verification_machine,
private_identity: private_identity.clone(), private_identity,
own_identity: Some(identity.clone()), own_identity: Some(identity.clone()),
device_owner_identity: Some(UserIdentities::Own(identity.clone())), device_owner_identity: Some(UserIdentities::Own(identity.clone())),
}; };

View File

@ -319,12 +319,12 @@ impl Sas {
// TODO store the request as well. // TODO store the request as well.
self.store.save_changes(changes).await?; self.store.save_changes(changes).await?;
Ok(merged_request Ok(merged_request
.map(|r| VerificationResult::SignatureUpload(r)) .map(VerificationResult::SignatureUpload)
.unwrap_or(VerificationResult::Ok)) .unwrap_or(VerificationResult::Ok))
} else { } else {
Ok(self Ok(self
.cancel() .cancel()
.map(|r| VerificationResult::Cancel(r)) .map(VerificationResult::Cancel)
.unwrap_or(VerificationResult::Ok)) .unwrap_or(VerificationResult::Ok))
} }
} }