Shift to idiomatic use of `map_err`
Test: keystore2_test
Test: legacykeystore_test
Flag: none, pure refactoring
Change-Id: I4b9f1b0d47145846764ff46676b10035f7f2fb6a
diff --git a/keystore2/src/service.rs b/keystore2/src/service.rs
index 2ca9ccf..3726358 100644
--- a/keystore2/src/service.rs
+++ b/keystore2/src/service.rs
@@ -35,7 +35,7 @@
error::ResponseCode,
};
use crate::{
- error::{self, map_or_log_err, ErrorCode},
+ error::{self, into_logged_binder, ErrorCode},
id_rotation::IdRotationState,
};
use android_hardware_security_keymint::aidl::android::hardware::security::keymint::SecurityLevel::SecurityLevel;
@@ -384,11 +384,11 @@
let _wp = wd::watch_millis_with("IKeystoreService::getSecurityLevel", 500, move || {
format!("security_level: {}", security_level.0)
});
- map_or_log_err(self.get_security_level(security_level))
+ self.get_security_level(security_level).map_err(into_logged_binder)
}
fn getKeyEntry(&self, key: &KeyDescriptor) -> binder::Result<KeyEntryResponse> {
let _wp = wd::watch("IKeystoreService::get_key_entry");
- map_or_log_err(self.get_key_entry(key))
+ self.get_key_entry(key).map_err(into_logged_binder)
}
fn updateSubcomponent(
&self,
@@ -397,17 +397,17 @@
certificate_chain: Option<&[u8]>,
) -> binder::Result<()> {
let _wp = wd::watch("IKeystoreService::updateSubcomponent");
- map_or_log_err(self.update_subcomponent(key, public_cert, certificate_chain))
+ self.update_subcomponent(key, public_cert, certificate_chain).map_err(into_logged_binder)
}
fn listEntries(&self, domain: Domain, namespace: i64) -> binder::Result<Vec<KeyDescriptor>> {
let _wp = wd::watch("IKeystoreService::listEntries");
- map_or_log_err(self.list_entries(domain, namespace))
+ self.list_entries(domain, namespace).map_err(into_logged_binder)
}
fn deleteKey(&self, key: &KeyDescriptor) -> binder::Result<()> {
let _wp = wd::watch("IKeystoreService::deleteKey");
let result = self.delete_key(key);
log_key_deleted(key, ThreadState::get_calling_uid(), result.is_ok());
- map_or_log_err(result)
+ result.map_err(into_logged_binder)
}
fn grant(
&self,
@@ -416,11 +416,11 @@
access_vector: i32,
) -> binder::Result<KeyDescriptor> {
let _wp = wd::watch("IKeystoreService::grant");
- map_or_log_err(self.grant(key, grantee_uid, access_vector.into()))
+ self.grant(key, grantee_uid, access_vector.into()).map_err(into_logged_binder)
}
fn ungrant(&self, key: &KeyDescriptor, grantee_uid: i32) -> binder::Result<()> {
let _wp = wd::watch("IKeystoreService::ungrant");
- map_or_log_err(self.ungrant(key, grantee_uid))
+ self.ungrant(key, grantee_uid).map_err(into_logged_binder)
}
fn listEntriesBatched(
&self,
@@ -429,11 +429,11 @@
start_past_alias: Option<&str>,
) -> binder::Result<Vec<KeyDescriptor>> {
let _wp = wd::watch("IKeystoreService::listEntriesBatched");
- map_or_log_err(self.list_entries_batched(domain, namespace, start_past_alias))
+ self.list_entries_batched(domain, namespace, start_past_alias).map_err(into_logged_binder)
}
fn getNumberOfEntries(&self, domain: Domain, namespace: i64) -> binder::Result<i32> {
let _wp = wd::watch("IKeystoreService::getNumberOfEntries");
- map_or_log_err(self.count_num_entries(domain, namespace))
+ self.count_num_entries(domain, namespace).map_err(into_logged_binder)
}
}