Remove duplicate Display and add matching FromStr for Vec3

Author: ShayBox

azalea-core/src/position.rs

@@ -7,14 +7,14 @@ use crate::resource_location::ResourceLocation;
 use azalea_buf::{BufReadError, McBuf, McBufReadable, McBufWritable};
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
-use std::fmt::Display;
 use std::str::FromStr;
 use std::{
     fmt,
     hash::Hash,
     io::{Cursor, Write},
     ops::{Add, AddAssign, Mul, Rem, Sub},
 };
+use std::num::{ParseFloatError, ParseIntError};
 
 macro_rules! vec3_impl {
     ($name:ident, $type:ty) => {
@@ -272,33 +272,6 @@ impl BlockPos {
     }
 }
 
-impl Display for BlockPos {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "({}, {}, {})", self.x, self.y, self.z)
-    }
-}
-
-impl FromStr for BlockPos {
-    type Err = &'static str;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let pos = s
-            .trim_matches(|c| c == '(' || c == ')')
-            .split(',')
-            .collect::<Vec<_>>();
-
-        if pos.len() != 3 {
-            return Err("Must be a length of 3");
-        }
-
-        Ok(BlockPos {
-            x: pos[0].parse()?,
-            y: pos[1].parse()?,
-            z: pos[2].parse()?,
-        })
-    }
-}
-
 /// Chunk coordinates are used to represent where a chunk is in the world. You
 /// can convert the x and z to block coordinates by multiplying them by 16.
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
@@ -602,6 +575,46 @@ impl fmt::Display for Vec3 {
     }
 }
 
+impl FromStr for BlockPos {
+    type Err = String;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let pos = s
+            .split(' ')
+            .collect::<Vec<_>>();
+
+        if pos.len() != 3 {
+            return Err("Must be a length of 3".to_string());
+        }
+
+        Ok(BlockPos {
+            x: pos[0].parse().map_err(|e: ParseIntError| e.to_string())?,
+            y: pos[1].parse().map_err(|e: ParseIntError| e.to_string())?,
+            z: pos[2].parse().map_err(|e: ParseIntError| e.to_string())?,
+        })
+    }
+}
+
+impl FromStr for Vec3 {
+    type Err = String;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let pos = s
+            .split(' ')
+            .collect::<Vec<_>>();
+
+        if pos.len() != 3 {
+            return Err("Must be a length of 3".to_string());
+        }
+
+        Ok(Vec3 {
+            x: pos[0].parse().map_err(|e: ParseFloatError| e.to_string())?,
+            y: pos[1].parse().map_err(|e: ParseFloatError| e.to_string())?,
+            z: pos[2].parse().map_err(|e: ParseFloatError| e.to_string())?,
+        })
+    }
+}
+
 const PACKED_X_LENGTH: u64 = 1 + 25; // minecraft does something a bit more complicated to get this 25
 const PACKED_Z_LENGTH: u64 = PACKED_X_LENGTH;
 const PACKED_Y_LENGTH: u64 = 64 - PACKED_X_LENGTH - PACKED_Z_LENGTH;