Update Android for Rust 1.83.0
* Unnecessary return
* Unnecessary lifetime
* Use `.div_ceil()`
Test: m rust
Bug: 384401387
Change-Id: I7139ff204d35d179cf41b1b26aab5530f7041b39
diff --git a/libs/apkverify/src/hashtree.rs b/libs/apkverify/src/hashtree.rs
index 00d8292..54e879b 100644
--- a/libs/apkverify/src/hashtree.rs
+++ b/libs/apkverify/src/hashtree.rs
@@ -84,7 +84,7 @@
let mut level0 = Cursor::new(&mut hash_tree[cur.start..cur.end]);
let mut a_block = vec![0; block_size];
- let mut num_blocks = (input_size + block_size - 1) / block_size;
+ let mut num_blocks = input_size.div_ceil(block_size);
while num_blocks > 0 {
input.read_exact(&mut a_block)?;
let h = hash_one_block(&a_block, salt, block_size, algorithm)?;
@@ -138,7 +138,7 @@
if input_size <= block_size {
break;
}
- let num_blocks = (input_size + block_size - 1) / block_size;
+ let num_blocks = input_size.div_ceil(block_size);
let hashes_size = round_to_multiple(num_blocks * digest_size, block_size);
level_sizes.push(hashes_size);
}
diff --git a/libs/bssl/src/cbb.rs b/libs/bssl/src/cbb.rs
index a48c714..282a77d 100644
--- a/libs/bssl/src/cbb.rs
+++ b/libs/bssl/src/cbb.rs
@@ -40,13 +40,13 @@
}
}
-impl<'a> AsRef<CBB> for CbbFixed<'a> {
+impl AsRef<CBB> for CbbFixed<'_> {
fn as_ref(&self) -> &CBB {
&self.cbb
}
}
-impl<'a> AsMut<CBB> for CbbFixed<'a> {
+impl AsMut<CBB> for CbbFixed<'_> {
fn as_mut(&mut self) -> &mut CBB {
&mut self.cbb
}
diff --git a/libs/bssl/src/cbs.rs b/libs/bssl/src/cbs.rs
index 12671cf..166484c 100644
--- a/libs/bssl/src/cbs.rs
+++ b/libs/bssl/src/cbs.rs
@@ -42,13 +42,13 @@
}
}
-impl<'a> AsRef<CBS> for Cbs<'a> {
+impl AsRef<CBS> for Cbs<'_> {
fn as_ref(&self) -> &CBS {
&self.cbs
}
}
-impl<'a> AsMut<CBS> for Cbs<'a> {
+impl AsMut<CBS> for Cbs<'_> {
fn as_mut(&mut self) -> &mut CBS {
&mut self.cbs
}
diff --git a/libs/bssl/src/ec_key.rs b/libs/bssl/src/ec_key.rs
index 3e2e382..da9eb77 100644
--- a/libs/bssl/src/ec_key.rs
+++ b/libs/bssl/src/ec_key.rs
@@ -471,7 +471,7 @@
/// Wrapper of an `EC_GROUP` reference.
struct EcGroup<'a>(&'a EC_GROUP);
-impl<'a> EcGroup<'a> {
+impl EcGroup<'_> {
/// Returns the NID that identifies the EC group of the key.
fn curve_nid(&self) -> i32 {
// SAFETY: It is safe since the inner pointer is valid and points to an initialized
@@ -518,7 +518,7 @@
}
}
-impl<'a> AsRef<EC_GROUP> for EcGroup<'a> {
+impl AsRef<EC_GROUP> for EcGroup<'_> {
fn as_ref(&self) -> &EC_GROUP {
self.0
}
diff --git a/libs/devicemapper/src/crypt.rs b/libs/devicemapper/src/crypt.rs
index 75417ed..1326caf 100644
--- a/libs/devicemapper/src/crypt.rs
+++ b/libs/devicemapper/src/crypt.rs
@@ -87,7 +87,7 @@
opt_params: Vec<&'a str>,
}
-impl<'a> Default for DmCryptTargetBuilder<'a> {
+impl Default for DmCryptTargetBuilder<'_> {
fn default() -> Self {
DmCryptTargetBuilder {
cipher: CipherType::AES256HCTR2,
diff --git a/libs/devicemapper/src/verity.rs b/libs/devicemapper/src/verity.rs
index 09087da..100320b 100644
--- a/libs/devicemapper/src/verity.rs
+++ b/libs/devicemapper/src/verity.rs
@@ -66,7 +66,7 @@
}
}
-impl<'a> Default for DmVerityTargetBuilder<'a> {
+impl Default for DmVerityTargetBuilder<'_> {
fn default() -> Self {
DmVerityTargetBuilder {
version: DmVerityVersion::V1,
diff --git a/libs/dice/driver/src/lib.rs b/libs/dice/driver/src/lib.rs
index b5c1f12..245bf11 100644
--- a/libs/dice/driver/src/lib.rs
+++ b/libs/dice/driver/src/lib.rs
@@ -185,7 +185,6 @@
#[cfg(test)]
mod tests {
use super::*;
- use core::ffi::CStr;
use diced_open_dice::{
hash, retry_bcc_format_config_descriptor, DiceConfigValues, HIDDEN_SIZE,
};
@@ -233,10 +232,7 @@
let dice = DiceDriver::from_file(&file_path)?;
- let values = DiceConfigValues {
- component_name: Some(CStr::from_bytes_with_nul(b"test\0")?),
- ..Default::default()
- };
+ let values = DiceConfigValues { component_name: Some(c"test"), ..Default::default() };
let desc = retry_bcc_format_config_descriptor(&values)?;
let code_hash = hash(&String::from("test code hash").into_bytes())?;
let authority_hash = hash(&String::from("test authority hash").into_bytes())?;
diff --git a/libs/dice/open_dice/src/bcc.rs b/libs/dice/open_dice/src/bcc.rs
index a3ddd76..1d9039d 100644
--- a/libs/dice/open_dice/src/bcc.rs
+++ b/libs/dice/open_dice/src/bcc.rs
@@ -172,7 +172,7 @@
bcc: Option<&'a [u8]>,
}
-impl<'a> DiceArtifacts for BccHandover<'a> {
+impl DiceArtifacts for BccHandover<'_> {
fn cdi_attest(&self) -> &[u8; CDI_SIZE] {
self.cdi_attest
}
diff --git a/libs/dice/sample_inputs/src/sample_inputs.rs b/libs/dice/sample_inputs/src/sample_inputs.rs
index c323bc4..adca46b 100644
--- a/libs/dice/sample_inputs/src/sample_inputs.rs
+++ b/libs/dice/sample_inputs/src/sample_inputs.rs
@@ -18,7 +18,6 @@
use alloc::vec;
use alloc::vec::Vec;
use ciborium::{de, ser, value::Value};
-use core::ffi::CStr;
use coset::{iana, Algorithm, AsCborValue, CoseKey, KeyOperation, KeyType, Label};
use diced_open_dice::{
derive_cdi_private_key_seed, keypair_from_seed, retry_bcc_format_config_descriptor,
@@ -115,7 +114,7 @@
// Gets the ABL certificate to as the root certificate of DICE chain.
let config_values = DiceConfigValues {
- component_name: Some(CStr::from_bytes_with_nul(b"ABL\0").unwrap()),
+ component_name: Some(c"ABL"),
component_version: Some(1),
resettable: true,
security_version: Some(10),
@@ -148,7 +147,7 @@
// Appends AVB certificate to DICE chain.
let config_values = DiceConfigValues {
- component_name: Some(CStr::from_bytes_with_nul(b"AVB\0").unwrap()),
+ component_name: Some(c"AVB"),
component_version: Some(1),
resettable: true,
security_version: Some(11),
@@ -173,7 +172,7 @@
// Appends Android certificate to DICE chain.
let config_values = DiceConfigValues {
- component_name: Some(CStr::from_bytes_with_nul(b"Android\0").unwrap()),
+ component_name: Some(c"Android"),
component_version: Some(12),
resettable: true,
security_version: Some(12),
diff --git a/libs/libfdt/src/iterators.rs b/libs/libfdt/src/iterators.rs
index 743c52b..1c66e4d 100644
--- a/libs/libfdt/src/iterators.rs
+++ b/libs/libfdt/src/iterators.rs
@@ -66,7 +66,7 @@
}
}
-impl<'a> Iterator for CellIterator<'a> {
+impl Iterator for CellIterator<'_> {
type Item = u32;
fn next(&mut self) -> Option<Self::Item> {
@@ -118,7 +118,7 @@
}
}
-impl<'a> Iterator for RegIterator<'a> {
+impl Iterator for RegIterator<'_> {
type Item = Reg<u64>;
fn next(&mut self) -> Option<Self::Item> {
@@ -161,7 +161,7 @@
}
}
-impl<'a> Iterator for MemRegIterator<'a> {
+impl Iterator for MemRegIterator<'_> {
type Item = Range<usize>;
fn next(&mut self) -> Option<Self::Item> {
@@ -215,8 +215,8 @@
}
}
-impl<'a, A: FromAddrCells, P: FromAddrCells, S: FromSizeCells> Iterator
- for RangesIterator<'a, A, P, S>
+impl<A: FromAddrCells, P: FromAddrCells, S: FromSizeCells> Iterator
+ for RangesIterator<'_, A, P, S>
{
type Item = AddressRange<A, P, S>;
diff --git a/libs/libfdt/src/lib.rs b/libs/libfdt/src/lib.rs
index 0dcd31a..47f4817 100644
--- a/libs/libfdt/src/lib.rs
+++ b/libs/libfdt/src/lib.rs
@@ -344,7 +344,7 @@
}
}
-impl<'a> PartialEq for FdtNode<'a> {
+impl PartialEq for FdtNode<'_> {
fn eq(&self, other: &Self) -> bool {
self.fdt.as_ptr() == other.fdt.as_ptr() && self.offset == other.offset
}
diff --git a/libs/libservice_vm_requests/src/cert.rs b/libs/libservice_vm_requests/src/cert.rs
index e31d870..de5ae1a 100644
--- a/libs/libservice_vm_requests/src/cert.rs
+++ b/libs/libservice_vm_requests/src/cert.rs
@@ -58,7 +58,7 @@
vm_components: Vec<VmComponent<'a>>,
}
-impl<'a> AssociatedOid for AttestationExtension<'a> {
+impl AssociatedOid for AttestationExtension<'_> {
const OID: ObjectIdentifier = AVF_ATTESTATION_EXTENSION_V1;
}
diff --git a/libs/libvm_payload/src/lib.rs b/libs/libvm_payload/src/lib.rs
index cbadec2..14aff99 100644
--- a/libs/libvm_payload/src/lib.rs
+++ b/libs/libvm_payload/src/lib.rs
@@ -27,7 +27,7 @@
use rpcbinder::{RpcServer, RpcSession};
use openssl::{ec::EcKey, sha::sha256, ecdsa::EcdsaSig};
use std::convert::Infallible;
-use std::ffi::{CString, CStr};
+use std::ffi::CString;
use std::fmt::Debug;
use std::os::raw::{c_char, c_void};
use std::path::Path;
@@ -376,20 +376,16 @@
#[no_mangle]
pub extern "C" fn AVmAttestationStatus_toString(status: AVmAttestationStatus) -> *const c_char {
let message = match status {
- AVmAttestationStatus::ATTESTATION_OK => {
- CStr::from_bytes_with_nul(b"The remote attestation completes successfully.\0").unwrap()
- }
+ AVmAttestationStatus::ATTESTATION_OK => c"The remote attestation completes successfully.",
AVmAttestationStatus::ATTESTATION_ERROR_INVALID_CHALLENGE => {
- CStr::from_bytes_with_nul(b"The challenge size is not between 0 and 64.\0").unwrap()
+ c"The challenge size is not between 0 and 64."
}
AVmAttestationStatus::ATTESTATION_ERROR_ATTESTATION_FAILED => {
- CStr::from_bytes_with_nul(b"Failed to attest the VM. Please retry at a later time.\0")
- .unwrap()
+ c"Failed to attest the VM. Please retry at a later time."
}
- AVmAttestationStatus::ATTESTATION_ERROR_UNSUPPORTED => CStr::from_bytes_with_nul(
- b"Remote attestation is not supported in the current environment.\0",
- )
- .unwrap(),
+ AVmAttestationStatus::ATTESTATION_ERROR_UNSUPPORTED => {
+ c"Remote attestation is not supported in the current environment."
+ }
};
message.as_ptr()
}
diff --git a/libs/libvm_payload/wrapper/attestation.rs b/libs/libvm_payload/wrapper/attestation.rs
index e0055d5..69fef4f 100644
--- a/libs/libvm_payload/wrapper/attestation.rs
+++ b/libs/libvm_payload/wrapper/attestation.rs
@@ -265,7 +265,7 @@
current: usize, // Invariant: current <= count
}
-impl<'a> Iterator for CertIterator<'a> {
+impl Iterator for CertIterator<'_> {
type Item = Vec<u8>;
fn next(&mut self) -> Option<Self::Item> {
@@ -284,5 +284,5 @@
}
}
-impl<'a> ExactSizeIterator for CertIterator<'a> {}
-impl<'a> FusedIterator for CertIterator<'a> {}
+impl ExactSizeIterator for CertIterator<'_> {}
+impl FusedIterator for CertIterator<'_> {}
diff --git a/libs/statslog_virtualization/Android.bp b/libs/statslog_virtualization/Android.bp
index 2860e6c..f33a147 100644
--- a/libs/statslog_virtualization/Android.bp
+++ b/libs/statslog_virtualization/Android.bp
@@ -72,4 +72,7 @@
rustlibs: [
"libstatslog_virtualization_rust_header",
],
+ flags: [
+ "-A clippy::needless-lifetimes",
+ ],
}