From 7f23faf8999069b283a370991f1f3220619304ba Mon Sep 17 00:00:00 2001
From: Terts Diepraam <terts.diepraam@gmail.com>
Date: Thu, 14 Dec 2023 16:35:56 +0100
Subject: [PATCH] expr: clean up conversion from bigint to usize

---
 src/uu/expr/src/syntax_tree.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/uu/expr/src/syntax_tree.rs b/src/uu/expr/src/syntax_tree.rs
index 7817b1721..28e4ff0bd 100644
--- a/src/uu/expr/src/syntax_tree.rs
+++ b/src/uu/expr/src/syntax_tree.rs
@@ -294,12 +294,14 @@ impl AstNode {
                 let pos = pos
                     .eval()?
                     .eval_as_bigint()
-                    .map_or(0.into(), |n| n.to_usize())
+                    .ok()
+                    .and_then(|n| n.to_usize())
                     .unwrap_or(0);
                 let length = length
                     .eval()?
                     .eval_as_bigint()
-                    .map_or(0.into(), |n| n.to_usize())
+                    .ok()
+                    .and_then(|n| n.to_usize())
                     .unwrap_or(0);
 
                 let (Some(pos), Some(_)) = (pos.checked_sub(1), length.checked_sub(1)) else {