crosvm_plugin: be more Rusty

Instead of writing "if let Some(x) = ret.ok()" let's write more
idiomatic "if let Ok(x) = ret".

BUG=none
TEST=sudo cargo test --features plugin

Change-Id: Id8c4d0fd2a05783759b5699b65d2333b2a1a6776
Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/956229
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/crosvm_plugin/src/lib.rs b/crosvm_plugin/src/lib.rs
index 4bb763f..e5c9844 100644
--- a/crosvm_plugin/src/lib.rs
+++ b/crosvm_plugin/src/lib.rs
@@ -919,7 +919,7 @@ pub unsafe extern "C" fn crosvm_check_extension(self_: *mut crosvm,
     let self_ = &mut (*self_);
     let ret = self_.check_extension(extension);
 
-    if let Some(supported) = ret.ok() {
+    if let Ok(supported) = ret {
         *has_extension = supported;
     }
     to_crosvm_rc(ret)
@@ -936,7 +936,7 @@ fn crosvm_get_supported_cpuid(this: *mut crosvm,
     let cpuid_entries = from_raw_parts_mut(cpuid_entries, entry_count as usize);
     let ret = this.get_supported_cpuid(cpuid_entries);
 
-    if let Some(num) = ret.ok() {
+    if let Ok(num) = ret {
         *out_count = num as u32;
     }
     to_crosvm_rc(ret)
@@ -953,7 +953,7 @@ fn crosvm_get_emulated_cpuid(this: *mut crosvm,
     let cpuid_entries = from_raw_parts_mut(cpuid_entries, entry_count as usize);
     let ret = this.get_emulated_cpuid(cpuid_entries);
 
-    if let Some(num) = ret.ok() {
+    if let Ok(num) = ret {
         *out_count = num as u32;
     }
     to_crosvm_rc(ret)
@@ -1033,7 +1033,7 @@ pub unsafe extern "C" fn crosvm_get_vcpu(self_: *mut crosvm,
     let self_ = &mut (*self_);
     let ret = self_.get_vcpu(cpu_id);
 
-    if let Some(vcpu) = ret.ok() {
+    if let Ok(vcpu) = ret {
         *out = vcpu;
     }
     to_crosvm_rc(ret)