From be6819fec3e1025d609eb0b3039c709c15e13a9d Mon Sep 17 00:00:00 2001 From: Bruno Carvalhal Date: Sun, 17 Nov 2024 16:36:13 +0100 Subject: [PATCH] Remove unwrap logic --- base/src/functions/text.rs | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/base/src/functions/text.rs b/base/src/functions/text.rs index 72e4ae7..30dd4ea 100644 --- a/base/src/functions/text.rs +++ b/base/src/functions/text.rs @@ -372,16 +372,19 @@ impl Model { } }; - if s.len() == 0 { - return CalcResult::Error { - error: Error::VALUE, - origin: cell, - message: "Empty cell".to_string(), - }; + match s.chars().next() { + Some(c) => { + let unicode_number = c as u32; + return CalcResult::Number(unicode_number as f64); + } + None => { + return CalcResult::Error { + error: Error::VALUE, + origin: cell, + message: "Empty cell".to_string(), + }; + } } - - let unicode_number = s.chars().nth(0).unwrap() as u32; - return CalcResult::Number(unicode_number as f64); } CalcResult::new_args_number_error(cell) }