From 843a03590bbaf73f17bcdf097fe1095e5a7cef9f Mon Sep 17 00:00:00 2001
From: Mathieu Poirier <mathieu.poirier@linaro.org>
Date: Mon, 29 Aug 2022 15:06:41 -0600
Subject: [PATCH] Preparation for upgrade to Rust version to 1.63.0

In preparation to upgrade to Rust version 1.63.0, address clippy
warning demanding that 'Eq' be derived when 'PartialEq' is.

Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
 gpio/src/backend.rs | 2 +-
 i2c/src/vhu_i2c.rs  | 2 +-
 rng/src/main.rs     | 4 ++--
 rng/src/vhu_rng.rs  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gpio/src/backend.rs b/gpio/src/backend.rs
index 5bfd709..68846f0 100644
--- a/gpio/src/backend.rs
+++ b/gpio/src/backend.rs
@@ -22,7 +22,7 @@ use crate::vhu_gpio::VhostUserGpioBackend;
 
 pub(crate) type Result<T> = std::result::Result<T, Error>;
 
-#[derive(Debug, PartialEq, ThisError)]
+#[derive(Debug, Eq, PartialEq, ThisError)]
 /// Errors related to low level GPIO helpers
 pub enum Error {
     #[error("Invalid socket count: {0}")]
diff --git a/i2c/src/vhu_i2c.rs b/i2c/src/vhu_i2c.rs
index bf5aaaa..677a3ce 100644
--- a/i2c/src/vhu_i2c.rs
+++ b/i2c/src/vhu_i2c.rs
@@ -36,7 +36,7 @@ const NUM_QUEUES: usize = 1;
 type Result<T> = std::result::Result<T, Error>;
 type VhostUserBackendResult<T> = std::result::Result<T, std::io::Error>;
 
-#[derive(Copy, Clone, Debug, PartialEq, ThisError)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, ThisError)]
 /// Errors related to vhost-device-i2c daemon.
 pub enum Error {
     #[error("Failed to handle event, didn't match EPOLLIN")]
diff --git a/rng/src/main.rs b/rng/src/main.rs
index 0fa8fa5..62ac529 100644
--- a/rng/src/main.rs
+++ b/rng/src/main.rs
@@ -25,7 +25,7 @@ const VHU_RNG_MAX_PERIOD_MS: u128 = 65536;
 
 type Result<T> = std::result::Result<T, Error>;
 
-#[derive(Debug, PartialEq, ThisError)]
+#[derive(Debug, Eq, PartialEq, ThisError)]
 /// Errors related to vhost-device-rng daemon.
 pub enum Error {
     #[error("RNG source file doesn't exists or can't be accessed")]
@@ -62,7 +62,7 @@ struct RngArgs {
     rng_source: String,
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct VuRngConfig {
     pub period_ms: u128,
     pub max_bytes: usize,
diff --git a/rng/src/vhu_rng.rs b/rng/src/vhu_rng.rs
index c9a1839..f32914f 100644
--- a/rng/src/vhu_rng.rs
+++ b/rng/src/vhu_rng.rs
@@ -32,7 +32,7 @@ const NUM_QUEUES: usize = 1;
 type Result<T> = std::result::Result<T, VuRngError>;
 type RngDescriptorChain = DescriptorChain<GuestMemoryLoadGuard<GuestMemoryMmap<()>>>;
 
-#[derive(Debug, PartialEq, ThisError)]
+#[derive(Debug, Eq, PartialEq, ThisError)]
 /// Errors related to vhost-device-rng daemon.
 pub enum VuRngError {
     #[error("Descriptor not found")]
@@ -65,7 +65,7 @@ impl convert::From<VuRngError> for io::Error {
     }
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct VuRngTimerConfig {
     period_ms: u128,
     period_start: Instant,