commit 62963d97c4270f755123a849719484615973f98d
author Charisee Chiw <chiw@google.com> Tue Apr 02 20:55:26 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 02 20:55:26 2024 +0000
tree e6ac8b087857ffdf0c72b1ca3be448a429eae924
parent 2dab9f29686a786a847f227f164146313cb6526c
parent 0f42bd4a83f1d120c15c36f57d8f2a3eebf95349

Merge "Update needed for Rust v1.77.0" into main

trusty/keymint/src/keymint_hal_main.rs

diff --git a/trusty/keymint/src/keymint_hal_main.rs b/trusty/keymint/src/keymint_hal_main.rs
index eda986a..ef0c598 100644
--- a/trusty/keymint/src/keymint_hal_main.rs
+++ b/trusty/keymint/src/keymint_hal_main.rs
@@ -82,7 +82,7 @@
 }
 
 fn main() {
-    if let Err(e) = inner_main() {
+    if let Err(HalServiceError(e)) = inner_main() {
         panic!("HAL service failed: {:?}", e);
     }
 }

trusty/secretkeeper/src/hal_main.rs

diff --git a/trusty/secretkeeper/src/hal_main.rs b/trusty/secretkeeper/src/hal_main.rs
index df30493..b31db13 100644
--- a/trusty/secretkeeper/src/hal_main.rs
+++ b/trusty/secretkeeper/src/hal_main.rs
@@ -91,7 +91,7 @@
 }
 
 fn main() {
-    if let Err(e) = inner_main() {
+    if let Err(HalServiceError(e)) = inner_main() {
         panic!("HAL service failed: {:?}", e);
     }
 }