Fix clippy
Some checks failed
Rust Checks / checks (push) Failing after 5s
Rust Checks / checks (pull_request) Failing after 5s

This commit is contained in:
CoCo_Sol 2024-02-14 10:51:25 +01:00
parent b6f7a202b4
commit 4da153b626

View file

@ -34,7 +34,7 @@ impl HexPosition {
/// ///
/// assert_eq!(a.distance_to(&b), 2.0); /// assert_eq!(a.distance_to(&b), 2.0);
/// ``` /// ```
pub fn distance_to(&self, other: &HexPosition) -> f32 { pub fn distance_to(&self, other: &Self) -> f32 {
// dx = |x1 - x2| and x = q // dx = |x1 - x2| and x = q
let dq = self.q - other.q; let dq = self.q - other.q;
@ -61,7 +61,7 @@ impl HexPosition {
/// # Example: /// # Example:
/// ///
/// ```no_run /// ```no_run
/// use border_wars::hex::HexPosition; /// use border_wars::hex::Self;
/// ///
/// let position = HexPosition { q: 0, r: 0 }; /// let position = HexPosition { q: 0, r: 0 };
/// ///
@ -69,56 +69,56 @@ impl HexPosition {
/// ///
/// assert_eq!(positions.len(), 7); /// assert_eq!(positions.len(), 7);
/// ``` /// ```
pub fn range(&self, range: i32) -> HashSet<HexPosition> { pub fn range(&self, range: i32) -> HashSet<Self> {
let mut result_positions = HashSet::new(); let mut result_positions = HashSet::new();
for q in (-range)..=range { for q in (-range)..=range {
for r in (-range).max(-q - range)..=range.min(-q + range) { for r in (-range).max(-q - range)..=range.min(-q + range) {
result_positions.insert(HexPosition { q, r }); result_positions.insert(Self { q, r });
} }
} }
result_positions result_positions
} }
} }
impl ops::Add<HexPosition> for HexPosition { impl ops::Add<Self> for HexPosition {
type Output = HexPosition; type Output = Self;
fn add(self, other: HexPosition) -> HexPosition { fn add(self, other: Self) -> Self::Output {
HexPosition { Self {
q: self.q + other.q, q: self.q + other.q,
r: self.r + other.r, r: self.r + other.r,
} }
} }
} }
impl ops::AddAssign<HexPosition> for HexPosition { impl ops::AddAssign<Self> for HexPosition {
fn add_assign(&mut self, other: HexPosition) { fn add_assign(&mut self, other: Self) {
*self = *self + other; *self = *self + other;
} }
} }
impl ops::Sub<HexPosition> for HexPosition { impl ops::Sub<Self> for HexPosition {
type Output = HexPosition; type Output = Self;
fn sub(self, other: HexPosition) -> HexPosition { fn sub(self, other: Self) -> Self {
HexPosition { Self {
q: self.q - other.q, q: self.q - other.q,
r: self.r - other.r, r: self.r - other.r,
} }
} }
} }
impl ops::SubAssign<HexPosition> for HexPosition { impl ops::SubAssign<Self> for HexPosition {
fn sub_assign(&mut self, other: HexPosition) { fn sub_assign(&mut self, other: Self) {
*self = *self - other; *self = *self - other;
} }
} }
impl ops::Mul<i32> for HexPosition { impl ops::Mul<i32> for HexPosition {
type Output = HexPosition; type Output = Self;
fn mul(self, other: i32) -> HexPosition { fn mul(self, other: i32) -> Self {
HexPosition { Self {
q: self.q * other, q: self.q * other,
r: self.r * other, r: self.r * other,
} }
@ -132,10 +132,10 @@ impl ops::MulAssign<i32> for HexPosition {
} }
impl ops::Div<i32> for HexPosition { impl ops::Div<i32> for HexPosition {
type Output = HexPosition; type Output = Self;
fn div(self, other: i32) -> HexPosition { fn div(self, other: i32) -> Self {
HexPosition { Self {
q: self.q / other, q: self.q / other,
r: self.r / other, r: self.r / other,
} }