commit 6f5a9b5d16366f3936b258b31a39652012687bfe
author Chris Wailes <chriswailes@google.com> Thu Aug 11 15:01:54 2022 -0700
committer Chris Wailes <chriswailes@google.com> Thu Aug 11 15:24:21 2022 -0700
tree b2f599b41f34f75ae8d834162d80e131788d22c0
parent 62d012dd996e1436cd73c7898824b1212548ccda

Update source for Rust 1.63.0

Test: m rust
Bug: 241303140
Change-Id: I049703784a73242c84414ea12e0ed82609add8c2

libs/apkverify/src/ziputil.rs

diff --git a/libs/apkverify/src/ziputil.rs b/libs/apkverify/src/ziputil.rs
index f18a38a..ebb66e0 100644
--- a/libs/apkverify/src/ziputil.rs
+++ b/libs/apkverify/src/ziputil.rs
@@ -27,7 +27,7 @@
 const EOCD_MAGIC: u32 = 0x06054b50;
 const ZIP64_MARK: u32 = 0xffffffff;
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub struct ZipSections {
     pub central_directory_offset: u32,
     pub central_directory_size: u32,

libs/idsig/src/apksigv4.rs

diff --git a/libs/idsig/src/apksigv4.rs b/libs/idsig/src/apksigv4.rs
index db8a8c6..f8ca184 100644
--- a/libs/idsig/src/apksigv4.rs
+++ b/libs/idsig/src/apksigv4.rs
@@ -75,7 +75,7 @@
 }
 
 /// Version of the idsig file format
-#[derive(Debug, PartialEq, FromPrimitive, ToPrimitive)]
+#[derive(Debug, PartialEq, Eq, FromPrimitive, ToPrimitive)]
 #[repr(u32)]
 pub enum Version {
     /// Version 2, the only supported version.
@@ -95,7 +95,7 @@
 }
 
 /// Hash algorithm that can be used for idsig file.
-#[derive(Debug, PartialEq, FromPrimitive, ToPrimitive)]
+#[derive(Debug, PartialEq, Eq, FromPrimitive, ToPrimitive)]
 #[repr(u32)]
 pub enum HashAlgorithm {
     /// SHA2-256
@@ -115,7 +115,7 @@
 }
 
 /// Signature algorithm that can be used for idsig file
-#[derive(Debug, PartialEq, FromPrimitive, ToPrimitive)]
+#[derive(Debug, PartialEq, Eq, FromPrimitive, ToPrimitive)]
 #[allow(non_camel_case_types)]
 #[repr(u32)]
 pub enum SignatureAlgorithmId {

microdroid_manager/src/instance.rs

diff --git a/microdroid_manager/src/instance.rs b/microdroid_manager/src/instance.rs
index 76c8b23..358d88b 100644
--- a/microdroid_manager/src/instance.rs
+++ b/microdroid_manager/src/instance.rs
@@ -285,7 +285,7 @@
     Ok(key)
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
 pub struct MicrodroidData {
     pub salt: Vec<u8>, // Should be [u8; 64] but that isn't serializable.
     pub apk_data: ApkData,
@@ -293,7 +293,7 @@
     pub apex_data: Vec<ApexData>,
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
 pub struct ApkData {
     pub root_hash: Box<RootHash>,
     pub pubkey: Box<[u8]>,
@@ -301,7 +301,7 @@
 
 pub type RootHash = [u8];
 
-#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
 pub struct ApexData {
     pub name: String,
     pub public_key: Vec<u8>,

zipfuse/src/inode.rs

diff --git a/zipfuse/src/inode.rs b/zipfuse/src/inode.rs
index e6c0254..5d52922 100644
--- a/zipfuse/src/inode.rs
+++ b/zipfuse/src/inode.rs
@@ -62,7 +62,7 @@
     pub kind: InodeKind,
 }
 
-#[derive(Debug, Clone, PartialEq, Copy)]
+#[derive(Debug, Clone, PartialEq, Eq, Copy)]
 pub enum InodeKind {
     Directory,
     File,