commit ebb3760ac00ec7960da933a12cb27581ce247698
author Pierre-Clément Tosi <ptosi@google.com> Fri Feb 17 14:57:26 2023 +0000
committer Pierre-Clément Tosi <ptosi@google.com> Fri Feb 17 15:57:12 2023 +0000
tree 101a22d9bf42eb12a577616b498978da517dbf8a
parent 1d41447423ac743a956c62b46da8d01e2c17d2f8

pvmfw: Make use of Rust 1.65 let-else

Test: m pvmfw_bin
Change-Id: I78f31e1df914c837a0ddc7f64c63cbbdf5012770

pvmfw/src/memory.rs

diff --git a/pvmfw/src/memory.rs b/pvmfw/src/memory.rs
index 7eecb97..ec2a687 100644
--- a/pvmfw/src/memory.rs
+++ b/pvmfw/src/memory.rs
@@ -314,10 +314,7 @@
     // non-zero size.
     let buffer = unsafe { alloc_zeroed(layout) };
 
-    // TODO: Use let-else once we have Rust 1.65 in AOSP.
-    let buffer = if let Some(buffer) = NonNull::new(buffer) {
-        buffer
-    } else {
+    let Some(buffer) = NonNull::new(buffer) else {
         handle_alloc_error(layout);
     };