Simplify map_or_log_err
All (non-test) invocations use the same second argument `Ok` (which
actually acts as a 1-arg closure `|v| Ok(v)`), so no need to have it as
a parameter. The common second argument just maps `Ok(v)` to `Ok(v)`,
which means that `map_err()` can be used instead of `map_or_else()`,
and the same type parameter is used for both input and output.
Test: legacykeystore_test
Test: keystore2_test
Flag: None, pure refactor
Change-Id: I46b6e327d0b546df6be6664781a52bb888c04eca
diff --git a/keystore2/src/service.rs b/keystore2/src/service.rs
index 1eab8a8..2ca9ccf 100644
--- a/keystore2/src/service.rs
+++ b/keystore2/src/service.rs
@@ -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), Ok)
+ map_or_log_err(self.get_security_level(security_level))
}
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), Ok)
+ map_or_log_err(self.get_key_entry(key))
}
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), Ok)
+ map_or_log_err(self.update_subcomponent(key, public_cert, certificate_chain))
}
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), Ok)
+ map_or_log_err(self.list_entries(domain, namespace))
}
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, Ok)
+ map_or_log_err(result)
}
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()), Ok)
+ map_or_log_err(self.grant(key, grantee_uid, access_vector.into()))
}
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), Ok)
+ map_or_log_err(self.ungrant(key, grantee_uid))
}
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), Ok)
+ map_or_log_err(self.list_entries_batched(domain, namespace, start_past_alias))
}
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), Ok)
+ map_or_log_err(self.count_num_entries(domain, namespace))
}
}