const RoomCoordinate::new() (#361)

rustyscreeps · Oct 25, 2021 · 1c5a3c6 · 1c5a3c6
1 parent 0a4a202
commit 1c5a3c6
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/local/room_coordinate.rs b/src/local/room_coordinate.rs
@@ -35,6 +35,15 @@ pub fn linear_index_to_xy(idx: usize) -> RoomXY {
 pub struct RoomCoordinate(u8);
 
 impl RoomCoordinate {
+    #[inline]
+    pub const fn new(coord: u8) -> Result<Self, OutOfBoundsError> {
+	if coord < ROOM_SIZE {
+            Ok(RoomCoordinate(coord))
+        } else {
+            Err(OutOfBoundsError(coord))
+        }
+    }
+
     // # Safety
     // Calling this method with `coord >= ROOM_SIZE` can result in undefined behaviour when the
     // resulting `RoomCoordinate` is used.
@@ -90,11 +99,7 @@ impl TryFrom<u8> for RoomCoordinate {
     type Error = OutOfBoundsError;
 
     fn try_from(coord: u8) -> Result<Self, Self::Error> {
-        if coord < ROOM_SIZE {
-            Ok(RoomCoordinate(coord))
-        } else {
-            Err(OutOfBoundsError(coord))
-        }
+        RoomCoordinate::new(coord)
     }
 }