summary refs log tree commit diff
path: root/src/linux.rs
diff options
context:
space:
mode:
authorJakub Staron <jstaron@google.com>2019-06-05 15:18:25 -0700
committerCommit Bot <commit-bot@chromium.org>2019-06-08 04:27:37 +0000
commitb6515a91675935dcaa9833c4a64c8a35b0971edb (patch)
tree223082ccfa46de7ef84b5d8bc931cda7f7cc2e0e /src/linux.rs
parentd879219ac07bea9e4d6dda8c95fdc039e095f642 (diff)
downloadcrosvm-b6515a91675935dcaa9833c4a64c8a35b0971edb.tar
crosvm-b6515a91675935dcaa9833c4a64c8a35b0971edb.tar.gz
crosvm-b6515a91675935dcaa9833c4a64c8a35b0971edb.tar.bz2
crosvm-b6515a91675935dcaa9833c4a64c8a35b0971edb.tar.lz
crosvm-b6515a91675935dcaa9833c4a64c8a35b0971edb.tar.xz
crosvm-b6515a91675935dcaa9833c4a64c8a35b0971edb.tar.zst
crosvm-b6515a91675935dcaa9833c4a64c8a35b0971edb.zip
crosvm: fix clippy warnings
Resolve a couple of minor clippy warnings:
 - unneeded return statement
 - use `if let` instead of `match` for single pattern destruction
 - use `values()` function to iterate over map values
 - supress warning about `ptr::null()` as expressed by the comment

BUG=None
TEST=./bin/clippy
TEST=cargo build

Change-Id: Ic4cea94cd3a25a9edf6ef38119de8c46dcfec563
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1646739
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Reviewed-by: Stephen Barber <smbarber@chromium.org>
Commit-Queue: Jakub StaroĊ„ <jstaron@google.com>
Diffstat (limited to 'src/linux.rs')
-rw-r--r--src/linux.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/linux.rs b/src/linux.rs
index 84bd699..271cc5b 100644
--- a/src/linux.rs
+++ b/src/linux.rs
@@ -1521,15 +1521,14 @@ fn run_control(
                             warn!("error while reading stdin: {}", e);
                             let _ = poll_ctx.delete(&stdin_handle);
                         }
-                        Ok(count) => match linux.stdio_serial {
-                            Some(ref stdio_serial) => {
+                        Ok(count) => {
+                            if let Some(ref stdio_serial) = linux.stdio_serial {
                                 stdio_serial
                                     .lock()
                                     .queue_input_bytes(&out[..count])
                                     .expect("failed to queue bytes into serial port");
                             }
-                            None => {}
-                        },
+                        }
                     }
                 }
                 Token::ChildSignal => {