commit 815461f3b32e64919992b3e2d059b79d6e9701bf
author Alice Wang <aliceywang@google.com> Tue Jan 31 12:59:00 2023 +0000
committer Alice Wang <aliceywang@google.com> Tue Jan 31 13:15:08 2023 +0000
tree 6e3ad221626e9d3e1119340e04a1144182958d77
parent f27528641184f4805d9bd7705187d8d0f871baa6

[refactoring] Use #[default] attribute to create enum default

Test: atest libpvmfw_avb.integration_test \
libapkverify.integration_test

Change-Id: Ib618692c6fa0f93db20fc0f934aa3887b7f9fcaa

pvmfw/avb/src/partition.rs

diff --git a/pvmfw/avb/src/partition.rs b/pvmfw/avb/src/partition.rs
index 10a5084..636bfd3 100644
--- a/pvmfw/avb/src/partition.rs
+++ b/pvmfw/avb/src/partition.rs
@@ -18,20 +18,15 @@
 use crate::utils::is_not_null;
 use core::ffi::{c_char, CStr};
 
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
 pub(crate) enum PartitionName {
+    /// The default `PartitionName` is needed to build the default `HashDescriptor`.
+    #[default]
     Kernel,
     InitrdNormal,
     InitrdDebug,
 }
 
-/// This is needed to build the default `HashDescriptor`.
-impl Default for PartitionName {
-    fn default() -> Self {
-        Self::Kernel
-    }
-}
-
 impl PartitionName {
     pub(crate) const NUM_OF_KNOWN_PARTITIONS: usize = 3;
 

pvmfw/src/heap.rs

diff --git a/pvmfw/src/heap.rs b/pvmfw/src/heap.rs
index e04451f..435a6ff 100644
--- a/pvmfw/src/heap.rs
+++ b/pvmfw/src/heap.rs
@@ -31,7 +31,7 @@
 static HEAP_ALLOCATOR: LockedHeap<32> = LockedHeap::<32>::new();
 
 /// 128 KiB
-const HEAP_SIZE: usize =  0x20000;
+const HEAP_SIZE: usize = 0x20000;
 static mut HEAP: [u8; HEAP_SIZE] = [0; HEAP_SIZE];
 
 pub unsafe fn init() {