remove to_string()

apache · Sep 12, 2023 · 82962e0 · 82962e0
1 parent fcca059
commit 82962e0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 22 deletions.
diff --git a/arrow-json/src/reader/primitive_array.rs b/arrow-json/src/reader/primitive_array.rs
@@ -46,10 +46,10 @@ macro_rules! primitive_parse {
             fn parse(s: &[u8]) -> Option<Self> {
                 match std::str::from_utf8(s) {
                     Ok(s) => {
-                        if let Ok(res) = s.to_string().parse::<$t>() {
+                        if let Ok(res) = s.parse::<$t>() {
                             Some(res)
                         } else {
-                            return s.to_string().parse::<f64>().ok().and_then(NumCast::from)
+                            return s.parse::<f64>().ok().and_then(NumCast::from)
                         }
                     }
                     Err(_) => None,
@@ -64,7 +64,7 @@ primitive_parse!(i8, i16, i32, i64, u8, u16, u32, u64);
 impl ParseJsonNumber for f16 {
     fn parse(s: &[u8]) -> Option<Self> {
         match std::str::from_utf8(s) {
-            Ok(s) => s.to_string().parse::<f16>().ok(),
+            Ok(s) => s.parse::<f16>().ok(),
             Err(_) => None,
         }
     }
@@ -73,7 +73,7 @@ impl ParseJsonNumber for f16 {
 impl ParseJsonNumber for f32 {
     fn parse(s: &[u8]) -> Option<Self> {
         match std::str::from_utf8(s) {
-            Ok(s) => s.to_string().parse::<f32>().ok(),
+            Ok(s) => s.parse::<f32>().ok(),
             Err(_) => None,
         }
     }
@@ -82,7 +82,7 @@ impl ParseJsonNumber for f32 {
 impl ParseJsonNumber for f64 {
     fn parse(s: &[u8]) -> Option<Self> {
         match std::str::from_utf8(s) {
-            Ok(s) => s.to_string().parse::<f64>().ok(),
+            Ok(s) => s.parse::<f64>().ok(),
             Err(_) => None,
         }
     }

diff --git a/arrow-json/src/reader/timestamp_array.rs b/arrow-json/src/reader/timestamp_array.rs
@@ -77,23 +77,15 @@ where
                 }
                 TapeElement::Number(idx) => {
                     let s = tape.get_string(idx);
-                    let b = s.as_bytes();
-                    let value = match std::str::from_utf8(b) {
-                        Ok(s) => s
-                            .parse::<i64>()
-                            .or_else(|_| s.parse::<f64>().map(|x| x as i64))
-                            .map_err(|_| {
-                                ArrowError::JsonError(format!(
-                                    "failed to parse {s} as {}",
-                                    self.data_type
-                                ))
-                            }),
-                        Err(_) => Err(ArrowError::JsonError(format!(
-                            "failed to parse {s} as {}",
-                            self.data_type
-                        ))),
-                    }?;
-
+                    let value = s
+                        .parse::<i64>()
+                        .or_else(|_| s.parse::<f64>().map(|x| x as i64))
+                        .map_err(|_| {
+                            ArrowError::JsonError(format!(
+                                "failed to parse {s} as {}",
+                                self.data_type
+                            ))
+                        })?;
                     builder.append_value(value)
                 }
                 _ => return Err(tape.error(*p, "primitive")),