From 45008ebe3604cd358fc7882b2afd159ecd6eb2d6 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Mon, 2 Aug 2021 11:08:52 +0800 Subject: [PATCH] xtask: simplify key file path extraction Signed-off-by: Sean Cross --- xtask/src/main.rs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/xtask/src/main.rs b/xtask/src/main.rs index cbcf1d203..0d44017c3 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -282,16 +282,8 @@ fn build_hw_image( std::env::set_var("XOUS_SVD_FILE", path.canonicalize().unwrap()); // extract key file names; replace with defaults if not specified - let loaderkey_file = if let Some(lkf) = lkey { - lkf - } else { - String::from("devkey/dev.key") - }; - let kernelkey_file = if let Some(kkf) = kkey { - kkf - } else { - String::from("devkey/dev.key") - }; + let loaderkey_file = lkey.unwrap_or("devkey/dev.key".into()); + let kernelkey_file = kkey.unwrap_or("devkey/dev.key".into()); let kernel = build_kernel(debug)?; let mut init = vec![];