Fix MSRV and Fedora builds

Remove inline formatting and add Eq alongside PartialEq.

Signed-off-by: Ionut Mihalcea <[email protected]>

Author: ionut-arm

tss-esapi-sys/build.rs

@@ -57,6 +57,7 @@ fn main() {
     }
 }
 
+#[allow(clippy::uninlined_format_args)]
 #[cfg(feature = "generate-bindings")]
 pub fn generate_from_system(esapi_out: PathBuf) {
     pkg_config::Config::new()
@@ -96,13 +97,13 @@ pub fn generate_from_system(esapi_out: PathBuf) {
         .expect("Error converting OsString to String.");
 
     bindgen::Builder::default()
-        .clang_arg(format!("-I{tss2_esys_include_path}/tss2/"))
-        .clang_arg(format!("-I{tss2_tctildr_include_path}/tss2/"))
-        .clang_arg(format!("-I{tss2_mu_include_path}/tss2/"))
+        .clang_arg(format!("-I{}/tss2/", tss2_esys_include_path))
+        .clang_arg(format!("-I{}/tss2/", tss2_tctildr_include_path))
+        .clang_arg(format!("-I{}/tss2/", tss2_mu_include_path))
         .rustfmt_bindings(true)
-        .header(format!("{tss2_esys_include_path}/tss2/tss2_esys.h"))
-        .header(format!("{tss2_tctildr_include_path}/tss2/tss2_tctildr.h"))
-        .header(format!("{tss2_mu_include_path}/tss2/tss2_mu.h"))
+        .header(format!("{}/tss2/tss2_esys.h", tss2_esys_include_path))
+        .header(format!("{}/tss2/tss2_tctildr.h", tss2_tctildr_include_path))
+        .header(format!("{}/tss2/tss2_mu.h", tss2_mu_include_path))
         // See this issue: https://github.com/parallaxsecond/rust-cryptoki/issues/12
         .blocklist_type("max_align_t")
         .generate_comments(false)

tss-esapi/src/constants/response_code.rs

@@ -16,7 +16,7 @@ bitfield! {
 }
 
 bitfield! {
-    #[derive(PartialEq, Copy, Clone)]
+    #[derive(PartialEq, Eq, Copy, Clone)]
     pub struct FormatZeroResponseCode(TSS2_RC);
     impl Debug;
     error_number, _: 6, 0;
@@ -36,7 +36,7 @@ impl std::fmt::Display for FormatZeroResponseCode {
 impl std::error::Error for FormatZeroResponseCode {}
 
 bitfield! {
-    #[derive(PartialEq, Copy, Clone)]
+    #[derive(PartialEq, Eq, Copy, Clone)]
     pub struct FormatOneResponseCode(TSS2_RC);
     impl Debug;
     error_number, _: 5, 0;
@@ -56,7 +56,7 @@ impl std::error::Error for FormatOneResponseCode {}
 
 /// Rust native representation of the TSS2 response codes as defined in the spec.
 #[allow(clippy::module_name_repetitions)]
-#[derive(Copy, Clone, PartialEq, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, Debug)]
 pub enum Tss2ResponseCode {
     Success,
     FormatZero(FormatZeroResponseCode),
@@ -234,7 +234,7 @@ impl Tss2ResponseCode {
 }
 
 /// Rust enum representation of TSS 2 error codes.
-#[derive(PartialEq, Copy, Clone, Debug)]
+#[derive(PartialEq, Eq, Copy, Clone, Debug)]
 pub enum Tss2ResponseCodeKind {
     // FormatZero errors
     Success,

tss-esapi/src/error.rs

@@ -7,7 +7,7 @@ use crate::tss2_esys::TSS2_RC;
 /// layer.
 pub type Result<T> = std::result::Result<T, Error>;
 
-#[derive(Copy, Clone, PartialEq, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, Debug)]
 pub enum Error {
     WrapperError(WrapperErrorKind),
     Tss2Error(Tss2ResponseCode),
@@ -51,7 +51,7 @@ impl std::error::Error for Error {
 }
 
 /// List of error types that might occur in the wrapper.
-#[derive(Copy, Clone, PartialEq, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, Debug)]
 pub enum WrapperErrorKind {
     /// Returned when a size or length-defined parameter does not conform with the size
     /// restrictions for it.

tss-esapi/src/structures/lists/ecc_curves.rs

@@ -11,7 +11,7 @@ use std::ops::Deref;
 ///
 /// # Details
 /// This corresponds to `TPML_ECC_CURVE`.
-#[derive(Debug, Clone, Default, PartialEq)]
+#[derive(Debug, Clone, Default, PartialEq, Eq)]
 pub struct EccCurveList {
     ecc_curves: Vec<EccCurveIdentifier>,
 }

tss-esapi/src/structures/lists/handles.rs

@@ -11,7 +11,7 @@ use std::ops::Deref;
 ///
 /// # Details
 /// This corresponds to `TPML_HANDLE`.
-#[derive(Debug, Clone, Default, PartialEq)]
+#[derive(Debug, Clone, Default, PartialEq, Eq)]
 pub struct HandleList {
     handles: Vec<TpmHandle>,
 }

tss-esapi/src/tcti_ldr.rs

@@ -126,7 +126,7 @@ impl Drop for TctiInfo {
 
 /// Placeholder TCTI types that can be used when initialising a `Context` to determine which
 /// interface will be used to communicate with the TPM.
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub enum TctiNameConf {
     /// Connect to a TPM available as a device node on the system
     ///
@@ -166,6 +166,7 @@ impl TctiNameConf {
     }
 }
 
+#[allow(clippy::uninlined_format_args)]
 impl TryFrom<TctiNameConf> for CString {
     type Error = Error;
 
@@ -206,7 +207,7 @@ impl TryFrom<TctiNameConf> for CString {
         if tcti_conf.is_empty() {
             CString::new(tcti_name).or(Err(Error::WrapperError(WrapperErrorKind::InvalidParam)))
         } else {
-            CString::new(format!("{tcti_name}:{tcti_conf}"))
+            CString::new(format!("{}:{}", tcti_name, tcti_conf))
                 .or(Err(Error::WrapperError(WrapperErrorKind::InvalidParam)))
         }
     }
@@ -314,7 +315,7 @@ fn validate_from_str_tcti() {
 ///
 /// The default configuration uses the library default of
 /// `/dev/tpm0`.
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct DeviceConfig {
     /// Path to the device node to connect to
     ///
@@ -356,7 +357,7 @@ fn validate_from_str_device_config() {
 /// Configuration for an Mssim TCTI context
 ///
 /// The default configuration will point to `localhost:2321`
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct NetworkTPMConfig {
     /// Address of the server to connect to
     ///
@@ -456,7 +457,7 @@ fn validate_from_str_networktpm_config() {
 /// Address of a TPM server
 ///
 /// The default value is `localhost`
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub enum ServerAddress {
     /// IPv4 or IPv6 address
     Ip(IpAddr),
@@ -499,7 +500,7 @@ impl Default for ServerAddress {
 }
 
 /// Configuration for a TABRMD TCTI context
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct TabrmdConfig {
     /// Bus name to be used by TABRMD
     ///
@@ -556,7 +557,7 @@ impl FromStr for TabrmdConfig {
 }
 
 /// DBus type for usage with TABRMD
-#[derive(Copy, Clone, Debug, PartialEq)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum BusType {
     System,
     Session,