Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a const constructor for RoomCoordinate #361

Merged
merged 1 commit into from
Oct 25, 2021
Merged

Add a const constructor for RoomCoordinate #361

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/local/room_coordinate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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)
}
}

Expand Down