xiretza/advent-of-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

common/rust: fix possible-panic clippy lint

Browse source
This commit is contained in:
Xiretza 2023-12-18 18:22:02 +00:00
parent ed41d840f5
commit 839b787de2
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
2022/day15/rust/src/main.rs
View file

@ -11,7 +11,7 @@ struct Sensor {
} }
impl Sensor { impl Sensor {
fn beacon_distance(self) -> usize { fn beacon_distance(self) -> u32 {
self.closest_beacon.manhattan_dist(self.position) self.closest_beacon.manhattan_dist(self.position)
} }
} }

24
common/rust/src/vec2.rs
View file

@ -24,22 +24,30 @@ impl Vec2 {
} }
} }
#[must_use]
pub fn map2(self, other: Vec2, mut f: impl FnMut(i32, i32) -> i32) -> Self {
Self {
x: f(self.x, other.x),
y: f(self.y, other.y),
}
}
#[must_use] #[must_use]
pub fn len(self) -> f64 { pub fn len(self) -> f64 {
(f64::from(self.x).powi(2) + f64::from(self.y).powi(2)).sqrt() (f64::from(self.x).powi(2) + f64::from(self.y).powi(2)).sqrt()
} }
/// Calculates the manhattan distance between `self` and `other`.
#[must_use] #[must_use]
pub fn manhattan_dist(self, other: Vec2) -> usize { pub fn manhattan_dist(self, other: Vec2) -> u32 {
let Vec2 { x, y } = (other - self).map(i32::abs); let x = self.x.abs_diff(other.x);
let x = usize::try_from(x).unwrap(); let y = self.y.abs_diff(other.y);
let y = usize::try_from(y).unwrap();
x + y x + y
} }
#[must_use] #[must_use]
pub fn on_x_with_manhattan_dist(self, x: i32, dist: usize) -> Option<(Vec2, Vec2)> { pub fn on_x_with_manhattan_dist(self, x: i32, dist: u32) -> Option<(Vec2, Vec2)> {
let dx = usize::try_from((x - self.x).abs()).ok()?; let dx = x.abs_diff(self.x);
let dy = dist.checked_sub(dx)?; let dy = dist.checked_sub(dx)?;
let dy = i32::try_from(dy).ok()?; let dy = i32::try_from(dy).ok()?;
@ -55,8 +63,8 @@ impl Vec2 {
} }
#[must_use] #[must_use]
pub fn on_y_with_manhattan_dist(self, y: i32, dist: usize) -> Option<(Vec2, Vec2)> { pub fn on_y_with_manhattan_dist(self, y: i32, dist: u32) -> Option<(Vec2, Vec2)> {
let dy = usize::try_from((y - self.y).abs()).ok()?; let dy = y.abs_diff(self.y);
let dx = dist.checked_sub(dy)?; let dx = dist.checked_sub(dy)?;
let dx = i32::try_from(dx).ok()?; let dx = i32::try_from(dx).ok()?;