RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

remove from trait for NumOrStr

Browse source
This commit is contained in:
Arpit Bhadauria 2023-12-11 20:47:36 +00:00
parent 824371d884
commit 3bf966df56
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/uu/expr/src/syntax_tree.rs
View file

@ -219,15 +219,6 @@ impl From<String> for NumOrStr {
} }
} }
impl From<NumOrStr> for Option<usize> {
fn from(s: NumOrStr) -> Self {
match s.eval_as_bigint() {
Ok(num) => num.to_usize(),
Err(_) => None,
}
}
}
impl NumOrStr { impl NumOrStr {
pub fn to_bigint(&self) -> Result<BigInt, ParseBigIntError> { pub fn to_bigint(&self) -> Result<BigInt, ParseBigIntError> {
match self { match self {
@ -300,8 +291,16 @@ impl AstNode {
// //
// So we coerce errors into 0 to make that the only case we // So we coerce errors into 0 to make that the only case we
// have to care about. // have to care about.
let pos: usize = Option::<usize>::from(pos.eval()?).unwrap_or(0); let pos = pos
let length: usize = Option::<usize>::from(length.eval()?).unwrap_or(0); .eval()?
.eval_as_bigint()
.map_or(0.into(), |n| n.to_usize())
.unwrap_or(0);
let length = length
.eval()?
.eval_as_bigint()
.map_or(0.into(), |n| n.to_usize())
.unwrap_or(0);
let (Some(pos), Some(_)) = (pos.checked_sub(1), length.checked_sub(1)) else { let (Some(pos), Some(_)) = (pos.checked_sub(1), length.checked_sub(1)) else {
return Ok(String::new().into()); return Ok(String::new().into());