From 4d2ae8485cd65429e64606119acac3156158ea2b Mon Sep 17 00:00:00 2001
From: Arpit Bhadauria <singharpit511@gmail.com>
Date: Mon, 4 Dec 2023 22:44:18 +0000
Subject: [PATCH] impl from trait instead of into

---
 src/uu/expr/src/syntax_tree.rs | 43 ++++++++++++++++------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/uu/expr/src/syntax_tree.rs b/src/uu/expr/src/syntax_tree.rs
index 7677b5e7e..ae2a44e52 100644
--- a/src/uu/expr/src/syntax_tree.rs
+++ b/src/uu/expr/src/syntax_tree.rs
@@ -89,8 +89,8 @@ impl RelationOp {
 
 impl NumericOp {
     fn eval(&self, left: &AstNode, right: &AstNode) -> ExprResult<NumOrStr> {
-        let a = <NumOrStr as Into<ExprResult<BigInt>>>::into(left.eval()?)?;
-        let b = <NumOrStr as Into<ExprResult<BigInt>>>::into(right.eval()?)?;
+        let a = ExprResult::<BigInt>::from(left.eval()?)?;
+        let b = ExprResult::<BigInt>::from(right.eval()?)?;
         Ok(NumOrStr::Num(match self {
             Self::Add => a + b,
             Self::Sub => a - b,
@@ -218,29 +218,29 @@ impl From<String> for NumOrStr {
     }
 }
 
-impl Into<Option<usize>> for NumOrStr {
-    fn into(self) -> Option<usize> {
-        match self.into() {
+impl From<NumOrStr> for Option<usize> {
+    fn from(s: NumOrStr) -> Self {
+        match s.into() {
             Ok(num) => num.to_usize(),
             Err(_) => None,
         }
     }
 }
 
-impl Into<String> for NumOrStr {
-    fn into(self) -> String {
-        match self {
-            Self::Num(num) => num.to_string(),
-            Self::Str(str) => str.to_string(),
+impl From<NumOrStr> for String {
+    fn from(s: NumOrStr) -> Self {
+        match s {
+            NumOrStr::Num(num) => num.to_string(),
+            NumOrStr::Str(str) => str.to_string(),
         }
     }
 }
 
-impl Into<ExprResult<BigInt>> for NumOrStr {
-    fn into(self) -> ExprResult<BigInt> {
-        match self {
-            Self::Num(num) => Ok(num),
-            Self::Str(str) => str
+impl From<NumOrStr> for ExprResult<BigInt> {
+    fn from(s: NumOrStr) -> Self {
+        match s {
+            NumOrStr::Num(num) => Ok(num),
+            NumOrStr::Str(str) => str
                 .parse::<BigInt>()
                 .map_err(|_| ExprError::NonIntegerArgument),
         }
@@ -303,9 +303,8 @@ impl AstNode {
                 //
                 // So we coerce errors into 0 to make that the only case we
                 // have to care about.
-                let pos: usize = <NumOrStr as Into<Option<usize>>>::into(pos.eval()?).unwrap_or(0);
-                let length: usize =
-                    <NumOrStr as Into<Option<usize>>>::into(length.eval()?).unwrap_or(0);
+                let pos: usize = Option::<usize>::from(pos.eval()?).unwrap_or(0);
+                let length: usize = Option::<usize>::from(length.eval()?).unwrap_or(0);
 
                 let (Some(pos), Some(_)) = (pos.checked_sub(1), length.checked_sub(1)) else {
                     return Ok(NumOrStr::from(String::new()));
@@ -315,11 +314,9 @@ impl AstNode {
                     string.chars().skip(pos).take(length).collect::<String>(),
                 ))
             }
-            Self::Length { string } => Ok(NumOrStr::from(
-                <NumOrStr as Into<String>>::into(string.eval()?)
-                    .chars()
-                    .count(),
-            )),
+            Self::Length { string } => {
+                Ok(NumOrStr::from(String::from(string.eval()?).chars().count()))
+            }
         }
     }
 }