From 7a5a7fc44ffc434192d109b1d889a4f7037fab0c Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Wed, 16 Oct 2019 12:54:20 -0700 Subject: [PATCH] arch: replace is_some + unwrap with `if let` BUG=None TEST=emerge-kevin crosvm Change-Id: I78aa9f4fb4fb46de3394bb9bc2fa5a53e210fa0b Signed-off-by: Daniel Verkamp Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1896085 Reviewed-by: Zach Reizner Tested-by: kokoro --- aarch64/src/lib.rs | 4 ++-- x86_64/src/lib.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aarch64/src/lib.rs b/aarch64/src/lib.rs index 69ae76c731..a35963b015 100644 --- a/aarch64/src/lib.rs +++ b/aarch64/src/lib.rs @@ -373,8 +373,8 @@ impl AArch64 { /// This returns a base part of the kernel command for this architecture fn get_base_linux_cmdline(stdio_serial_num: Option) -> kernel_cmdline::Cmdline { let mut cmdline = kernel_cmdline::Cmdline::new(sys_util::pagesize()); - if stdio_serial_num.is_some() { - let tty_string = get_serial_tty_string(stdio_serial_num.unwrap()); + if let Some(stdio_serial_num) = stdio_serial_num { + let tty_string = get_serial_tty_string(stdio_serial_num); cmdline.insert("console", &tty_string).unwrap(); } cmdline.insert_str("panic=-1").unwrap(); diff --git a/x86_64/src/lib.rs b/x86_64/src/lib.rs index c866e56742..c15221e301 100644 --- a/x86_64/src/lib.rs +++ b/x86_64/src/lib.rs @@ -594,8 +594,8 @@ impl X8664arch { /// This returns a minimal kernel command for this architecture fn get_base_linux_cmdline(stdio_serial_num: Option) -> kernel_cmdline::Cmdline { let mut cmdline = kernel_cmdline::Cmdline::new(CMDLINE_MAX_SIZE as usize); - if stdio_serial_num.is_some() { - let tty_string = get_serial_tty_string(stdio_serial_num.unwrap()); + if let Some(stdio_serial_num) = stdio_serial_num { + let tty_string = get_serial_tty_string(stdio_serial_num); cmdline.insert("console", &tty_string).unwrap(); } cmdline.insert_str("noacpi reboot=k panic=-1").unwrap();