Bump Parsec rust edition

Signed-off-by: Anton Antonov <Anton.Antonov@arm.com>

Author: anta5010

Cargo.toml

@@ -8,7 +8,7 @@ repository = "https://github.com/parallaxsecond/parsec"
 readme = "README.md"
 keywords = ["security", "service"]
 categories = ["cryptography", "hardware-support"]
-edition = "2021"
+edition = "2024"
 rust-version = "1.85.0"
 
 [[bin]]

src/back/backend_handler.rs

@@ -88,7 +88,7 @@ impl BackEndHandler {
         let header = request.header;
 
         macro_rules! unwrap_or_else_return {
-            ($result:expr) => {
+            ($result:expr_2021) => {
                 match $result {
                     Ok(value) => value,
                     Err(status) => return Response::from_request_header(header, status),

src/bin/main.rs

@@ -141,20 +141,20 @@ fn main() -> Result<()> {
             info!("Parsec configuration reloaded.");
         }
 
-        if let Some(connection) = listener.accept() {
+        match listener.accept() { Some(connection) => {
             let front_end_handler = front_end_handler.clone();
             threadpool.execute(move || {
                 front_end_handler.handle_request(connection);
                 trace!("handle_request egress");
             });
-        } else {
+        } _ => {
             std::thread::sleep(Duration::from_millis(
                 config
                     .core_settings
                     .idle_listener_sleep_duration
                     .unwrap_or(MAIN_LOOP_DEFAULT_SLEEP),
             ));
-        }
+        }}
     }
 
     let _ = sd_notify::notify(&[sd_notify::NotifyState::Stopping]);

src/key_info_managers/sqlite_manager/mod.rs

@@ -382,21 +382,21 @@ impl ManageKeyInfo for SQLiteKeyInfoManager {
         key_identity: KeyIdentity,
         key_info: KeyInfo,
     ) -> Result<Option<KeyInfo>, String> {
-        if let Err(err) = self.save_mapping(&key_identity, &key_info) {
+        match self.save_mapping(&key_identity, &key_info) { Err(err) => {
             Err(err.to_string())
-        } else {
+        } _ => {
             Ok(self.key_store.insert(key_identity, key_info))
-        }
+        }}
     }
 
     fn remove(&mut self, key_identity: &KeyIdentity) -> Result<Option<KeyInfo>, String> {
-        if let Err(err) = self.delete_mapping(key_identity) {
+        match self.delete_mapping(key_identity) { Err(err) => {
             Err(err.to_string())
-        } else if let Some(key_info) = self.key_store.remove(key_identity) {
+        } _ => { match self.key_store.remove(key_identity) { Some(key_info) => {
             Ok(Some(key_info))
-        } else {
+        } _ => {
             Ok(None)
-        }
+        }}}}
     }
 
     fn exists(&self, key_identity: &KeyIdentity) -> Result<bool, String> {

src/lib.rs

@@ -36,7 +36,7 @@
 
 #[allow(unused)]
 macro_rules! format_error {
-    ($message:expr, $error:expr) => {
+    ($message:expr_2021, $error:expr_2021) => {
         if crate::utils::GlobalConfig::log_error_details() {
             log::error!("{}; Error: {}", $message, $error)
         } else {
@@ -47,7 +47,7 @@ macro_rules! format_error {
 
 #[allow(unused)]
 macro_rules! deprecation_check {
-    ($operation:ident, $warning:expr, $return_flag:expr) => {
+    ($operation:ident, $warning:expr_2021, $return_flag:expr_2021) => {
         if let Err(ResponseStatus::DeprecatedPrimitive) = $operation.check_deprecated() {
             log::warn!("{}", $warning);
             if $return_flag && !crate::utils::GlobalConfig::allow_deprecated() {
@@ -59,14 +59,14 @@ macro_rules! deprecation_check {
 
 #[allow(unused)]
 macro_rules! warn_on_deprecated {
-    ($operation:ident, $warning:expr) => {
+    ($operation:ident, $warning:expr_2021) => {
         deprecation_check!($operation, $warning, false);
     };
 }
 
 #[allow(unused)]
 macro_rules! return_on_deprecated {
-    ($operation:ident, $warning:expr) => {
+    ($operation:ident, $warning:expr_2021) => {
         deprecation_check!($operation, $warning, true);
     };
 }

src/providers/tpm/mod.rs

@@ -391,7 +391,7 @@ impl ProviderBuilder {
     ///
     /// Undefined behaviour might appear if two instances of TransientObjectContext are created
     /// using a same TCTI that does not handle multiple applications concurrently.
-    pub unsafe fn build(mut self) -> std::io::Result<Provider> {
+    pub unsafe fn build(mut self) -> std::io::Result<Provider> { unsafe {
         let owner_auth_unparsed = self.owner_hierarchy_auth.take();
         let owner_auth = self.get_hierarchy_auth(owner_auth_unparsed)?;
         let default_cipher = self.find_default_context_cipher()?;
@@ -515,7 +515,7 @@ impl ProviderBuilder {
         }
 
         Ok(built_provider)
-    }
+    }}
 }
 
 #[cfg(test)]

src/utils/service_builder.rs

@@ -300,7 +300,7 @@ fn build_providers(
 unsafe fn get_provider(
     config: &ProviderConfig,
     kim_factory: &KeyInfoManagerFactory,
-) -> Result<Option<Provider>> {
+) -> Result<Option<Provider>> { unsafe {
     match config {
         #[cfg(feature = "mbed-crypto-provider")]
         ProviderConfig::MbedCrypto { .. } => {
@@ -452,7 +452,7 @@ unsafe fn get_provider(
             Err(Error::new(ErrorKind::InvalidData, "provider not compiled").into())
         }
     }
-}
+}}
 
 fn get_key_info_manager_builders(
     configs: &[KeyInfoManagerConfig],