Temporarily disable a bunch of new linter errors
With the upgrade to 1.51.0 there are a bunch of new clippy
errors. Disable these on a per-file basis until they can be
addressed by the keystore owners.
Test: TH
Bug: 184833962
Change-Id: Idd96447370d6ff31032bbaecddbce0a035821f41
diff --git a/keystore2/src/async_task.rs b/keystore2/src/async_task.rs
index 20a7458..4d0034a 100644
--- a/keystore2/src/async_task.rs
+++ b/keystore2/src/async_task.rs
@@ -197,7 +197,7 @@
enum Action {
QueuedFn(Box<dyn FnOnce(&mut Shelf) + Send>),
IdleFns(Vec<Arc<dyn Fn(&mut Shelf) + Send + Sync>>),
- };
+ }
let mut done_idle = false;
// When the worker starts, it takes the shelf and puts it on the stack.
diff --git a/keystore2/src/database.rs b/keystore2/src/database.rs
index 6a07716..da482f1 100644
--- a/keystore2/src/database.rs
+++ b/keystore2/src/database.rs
@@ -41,6 +41,8 @@
//! from the database module these functions take permission check
//! callbacks.
+#![allow(clippy::needless_question_mark)]
+
use crate::impl_metadata; // This is in db_utils.rs
use crate::key_parameter::{KeyParameter, Tag};
use crate::permission::KeyPermSet;
diff --git a/keystore2/src/key_parameter.rs b/keystore2/src/key_parameter.rs
index e536e45..74a9b23 100644
--- a/keystore2/src/key_parameter.rs
+++ b/keystore2/src/key_parameter.rs
@@ -90,6 +90,8 @@
//! * The termination condition which has an empty in list.
//! * The public interface, which does not have @marker and calls itself with an empty out list.
+#![allow(clippy::from_over_into, clippy::needless_question_mark)]
+
use std::convert::TryInto;
use crate::db_utils::SqlField;
diff --git a/keystore2/src/legacy_blob.rs b/keystore2/src/legacy_blob.rs
index c108b32..65e6818 100644
--- a/keystore2/src/legacy_blob.rs
+++ b/keystore2/src/legacy_blob.rs
@@ -14,6 +14,8 @@
//! This module implements methods to load legacy keystore key blob files.
+#![allow(clippy::redundant_slicing)]
+
use crate::{
error::{Error as KsError, ResponseCode},
key_parameter::{KeyParameter, KeyParameterValue},
@@ -1138,7 +1140,7 @@
let encoded = LegacyBlobLoader::encode_alias(&alias_str);
let decoded = match LegacyBlobLoader::decode_alias(&encoded) {
Ok(d) => d,
- Err(_) => panic!(format!("random_alias: {:x?}\nencoded {}", random_alias, encoded)),
+ Err(_) => panic!("random_alias: {:x?}\nencoded {}", random_alias, encoded),
};
assert_eq!(random_alias.to_vec(), decoded.bytes().collect::<Vec<u8>>());
}
diff --git a/keystore2/src/permission.rs b/keystore2/src/permission.rs
index 45c4dc1..726c2ec 100644
--- a/keystore2/src/permission.rs
+++ b/keystore2/src/permission.rs
@@ -18,6 +18,8 @@
//! It also provides KeystorePerm and KeyPerm as convenience wrappers for the SELinux permission
//! defined by keystore2 and keystore2_key respectively.
+#![allow(clippy::from_over_into)]
+
use android_system_keystore2::aidl::android::system::keystore2::{
Domain::Domain, KeyDescriptor::KeyDescriptor, KeyPermission::KeyPermission,
};
diff --git a/keystore2/src/remote_provisioning.rs b/keystore2/src/remote_provisioning.rs
index 1c757c9..f99805d 100644
--- a/keystore2/src/remote_provisioning.rs
+++ b/keystore2/src/remote_provisioning.rs
@@ -19,6 +19,8 @@
//! certificate chains signed by some root authority and stored in a keystore SQLite
//! DB.
+#![allow(clippy::from_over_into, clippy::needless_question_mark, clippy::vec_init_then_push)]
+
use std::collections::HashMap;
use android_hardware_security_keymint::aidl::android::hardware::security::keymint::{