From e04d1bfadc6d6776c553729a09473f2f5b10019d Mon Sep 17 00:00:00 2001 From: Christian Ebner Date: Wed, 20 Mar 2019 09:28:14 +0100 Subject: [PATCH] Cleanup of if statement with unwraps by a more compact match statement Signed-off-by: Christian Ebner --- src/cli/command.rs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/cli/command.rs b/src/cli/command.rs index 053b0cb6..ee9503ee 100644 --- a/src/cli/command.rs +++ b/src/cli/command.rs @@ -38,16 +38,13 @@ fn get_schema_type_text(schema: &Schema, _style: ParameterDisplayStyle) -> Strin Schema::String(_) => String::from(""), Schema::Boolean(_) => String::from(""), Schema::Integer(integer_schema) => { - if integer_schema.minimum != None && integer_schema.maximum != None { - format!(" ({} - {})", integer_schema.minimum.unwrap(), integer_schema.maximum.unwrap()) - } else if integer_schema.minimum != None { - format!(" ({} - N)", integer_schema.minimum.unwrap()) - } else if integer_schema.maximum != None { - format!(" (-N - {})", integer_schema.maximum.unwrap()) - } else { - String::from("") - } - }, + match (integer_schema.minimum, integer_schema.maximum) { + (Some(min), Some(max)) => format!(" ({} - {})", min, max), + (Some(min), None) => format!(" ({} - N)", min), + (None, Some(max)) => format!(" (-N - {})", max), + _ => String::from(""), + } + }, Schema::Object(_) => String::from(""), Schema::Array(_) => String::from(""), };