Skip to content

Commit dde70a2

Browse files
authored
Fix clippy and fmt (#84)
* fmt * clippy
1 parent a9fa350 commit dde70a2

File tree

4 files changed

+17
-21
lines changed

4 files changed

+17
-21
lines changed

src/async_helpers.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pub struct FuturePath<'m> {
2020
pub(crate) ending_polygon: u32,
2121
}
2222

23-
impl<'m> fmt::Debug for FuturePath<'m> {
23+
impl fmt::Debug for FuturePath<'_> {
2424
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
2525
f.debug_struct("FuturePath")
2626
.field("from", &self.from)
@@ -29,7 +29,7 @@ impl<'m> fmt::Debug for FuturePath<'m> {
2929
}
3030
}
3131

32-
impl<'m> Future for FuturePath<'m> {
32+
impl Future for FuturePath<'_> {
3333
type Output = Option<Path>;
3434

3535
fn poll(

src/input/triangulation.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,10 @@ impl Triangulation {
138138
}
139139

140140
/// Add obstacles delimited by the list of points on their edges.
141-
pub fn add_obstacles(&mut self, obstacles: impl IntoIterator<Item = impl IntoIterator<Item = Vec2>>) {
141+
pub fn add_obstacles(
142+
&mut self,
143+
obstacles: impl IntoIterator<Item = impl IntoIterator<Item = Vec2>>,
144+
) {
142145
let (exterior, interiors) =
143146
std::mem::replace(&mut self.inner, GeoPolygon::new(LineString(vec![]), vec![]))
144147
.into_inner();

src/stitching.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -726,8 +726,7 @@ mod tests {
726726
vec![vec2(2.0, 2.0), vec2(2.0, 1.75), vec2(1.75, 2.0)],
727727
] {
728728
triangulation_a.add_obstacle(obstacle.clone());
729-
triangulation_b
730-
.add_obstacle(obstacle.into_iter().map(|v| v - vec2(1.0, 0.0)));
729+
triangulation_b.add_obstacle(obstacle.into_iter().map(|v| v - vec2(1.0, 0.0)));
731730
}
732731
let mut mesh = Mesh::default();
733732
let mut layer_a = triangulation_a.as_layer();

tests/triangulation.rs

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -173,14 +173,11 @@ fn is_in_mesh_simplified() {
173173
// adding a circle obstacle in the middle
174174
let nb_points = 100;
175175
let radius = 2.5;
176-
triangulation.add_obstacle(
177-
(0..nb_points)
178-
.map(|i| {
179-
let angle = i as f32 * std::f32::consts::TAU / nb_points as f32;
180-
let (x, y) = angle.sin_cos();
181-
vec2(x, y) * radius + vec2(5.0, 5.0)
182-
})
183-
);
176+
triangulation.add_obstacle((0..nb_points).map(|i| {
177+
let angle = i as f32 * std::f32::consts::TAU / nb_points as f32;
178+
let (x, y) = angle.sin_cos();
179+
vec2(x, y) * radius + vec2(5.0, 5.0)
180+
}));
184181
let polygons_before = triangulation.as_navmesh().layers[0].polygons.clone();
185182
triangulation.simplify(0.1);
186183
let mesh: Mesh = triangulation.as_navmesh();
@@ -208,14 +205,11 @@ fn is_in_mesh_overlapping_simplified() {
208205
// adding a circle obstacle in the middle
209206
let nb_points = 1000;
210207
let radius = 2.5;
211-
triangulation.add_obstacle(
212-
(0..nb_points)
213-
.map(|i| {
214-
let angle = i as f32 * std::f32::consts::TAU / nb_points as f32;
215-
let (x, y) = angle.sin_cos();
216-
vec2(x, y) * radius + vec2(5.0, 5.0)
217-
})
218-
);
208+
triangulation.add_obstacle((0..nb_points).map(|i| {
209+
let angle = i as f32 * std::f32::consts::TAU / nb_points as f32;
210+
let (x, y) = angle.sin_cos();
211+
vec2(x, y) * radius + vec2(5.0, 5.0)
212+
}));
219213
triangulation.add_obstacle(vec![
220214
vec2(2.5, 2.5),
221215
vec2(2.5, 5.0),

0 commit comments

Comments
 (0)