Skip to content

Commit 7c257f8

Browse files
Rémi Lauzierkvark
Rémi Lauzier
authored andcommitted
Fix some clippy warnings
1 parent 6a0fc77 commit 7c257f8

File tree

15 files changed

+108
-84
lines changed

15 files changed

+108
-84
lines changed

benches/polyhedron.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ fn sphere(n: usize, with_faces: bool) -> ConvexPolyhedron<f32> {
101101
.map(|f| (f.x, f.y, f.z))
102102
.collect::<Vec<_>>();
103103

104-
ConvexPolyhedron::new_with_faces(vertices, faces)
104+
ConvexPolyhedron::new_with_faces(&vertices, &faces)
105105
} else {
106-
ConvexPolyhedron::new(vertices)
106+
ConvexPolyhedron::new(&vertices)
107107
}
108108
}

src/algorithm/minkowski/epa/epa2d.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -166,17 +166,17 @@ mod tests {
166166

167167
#[test]
168168
fn test_closest_edge_0() {
169-
assert_eq!(None, closest_edge::<f32>(&[]))
169+
assert_eq!(None, closest_edge::<f32>(&[]));
170170
}
171171

172172
#[test]
173173
fn test_closest_edge_1() {
174-
assert_eq!(None, closest_edge(&[sup(10., 10.)]))
174+
assert_eq!(None, closest_edge(&[sup(10., 10.)]));
175175
}
176176

177177
#[test]
178178
fn test_closest_edge_2() {
179-
assert_eq!(None, closest_edge(&[sup(10., 10.), sup(-10., 5.)]))
179+
assert_eq!(None, closest_edge(&[sup(10., 10.), sup(-10., 5.)]));
180180
}
181181

182182
#[test]
@@ -185,9 +185,9 @@ mod tests {
185185
assert!(edge.is_some());
186186
let edge = edge.unwrap();
187187
assert_eq!(2, edge.index);
188-
assert_ulps_eq!(2.5607374, edge.distance);
189-
assert_ulps_eq!(-0.6401844, edge.normal.x);
190-
assert_ulps_eq!(-0.7682213, edge.normal.y);
188+
assert_ulps_eq!(2.560_737_4, edge.distance);
189+
assert_ulps_eq!(-0.640_184_4, edge.normal.x);
190+
assert_ulps_eq!(-0.768_221_3, edge.normal.y);
191191
}
192192

193193
#[test]

src/algorithm/minkowski/epa/epa3d.rs

+26-3
Original file line numberDiff line numberDiff line change
@@ -253,11 +253,34 @@ mod tests {
253253
let faces = Face::new(&simplex);
254254
assert_eq!(4, faces.len());
255255
assert_face(
256-
&faces[0], 3, 2, 1, -0.8728715, 0.43643576, 0.21821788, 1.0910894,
256+
&faces[0],
257+
3,
258+
2,
259+
1,
260+
-0.872_871_5,
261+
0.436_435_76,
262+
0.218_217_88,
263+
1.091_089_4,
257264
);
258-
assert_face(&faces[1], 3, 1, 0, 0., -0.89442724, 0.44721362, 2.236068);
259265
assert_face(
260-
&faces[2], 3, 0, 2, 0.8728715, 0.43643576, 0.21821788, 1.0910894,
266+
&faces[1],
267+
3,
268+
1,
269+
0,
270+
0.,
271+
-0.894_427_24,
272+
0.447_213_62,
273+
2.236_068,
274+
);
275+
assert_face(
276+
&faces[2],
277+
3,
278+
0,
279+
2,
280+
0.872_871_5,
281+
0.436_435_76,
282+
0.218_217_88,
283+
1.091_089_4,
261284
);
262285
assert_face(&faces[3], 2, 0, 1, 0., 0., -1., 1.0);
263286
}

src/algorithm/minkowski/gjk/mod.rs

+20-20
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ use cgmath::ulps_eq;
2020
mod simplex;
2121

2222
const MAX_ITERATIONS: u32 = 100;
23-
const GJK_DISTANCE_TOLERANCE: f32 = 0.000001;
24-
const GJK_CONTINUOUS_TOLERANCE: f32 = 0.000001;
23+
const GJK_DISTANCE_TOLERANCE: f32 = 0.000_001;
24+
const GJK_CONTINUOUS_TOLERANCE: f32 = 0.000_001;
2525

2626
/// GJK algorithm for 2D, see [GJK](struct.GJK.html) for more information.
2727
pub type GJK2<S> = GJK<SimplexProcessor2<S>, EPA2<S>, S>;
@@ -163,9 +163,9 @@ where
163163
pub fn intersection_time_of_impact<P, PL, PR, TL, TR>(
164164
&self,
165165
left: &PL,
166-
left_transform: Range<&TL>,
166+
left_transform: &Range<&TL>,
167167
right: &PR,
168-
right_transform: Range<&TR>,
168+
right_transform: &Range<&TR>,
169169
) -> Option<Contact<P>>
170170
where
171171
P: EuclideanSpace<Scalar = S>,
@@ -506,7 +506,7 @@ where
506506
min_distance = Some(
507507
min_distance
508508
.map_or(distance, |min_distance| distance.min(min_distance)),
509-
)
509+
);
510510
}
511511
}
512512
}
@@ -539,9 +539,9 @@ where
539539
&self,
540540
strategy: &CollisionStrategy,
541541
left: &[(PL, TL)],
542-
left_transform: Range<&TL>,
542+
left_transform: &Range<&TL>,
543543
right: &[(PR, TR)],
544-
right_transform: Range<&TR>,
544+
right_transform: &Range<&TR>,
545545
) -> Option<Contact<P>>
546546
where
547547
P: EuclideanSpace<Scalar = S>,
@@ -562,9 +562,9 @@ where
562562
let right_end_transform = right_transform.end.concat(right_local_transform);
563563
if let Some(mut contact) = self.intersection_time_of_impact(
564564
left_primitive,
565-
&left_start_transform..&left_end_transform,
565+
&(&left_start_transform..&left_end_transform),
566566
right_primitive,
567-
&right_start_transform..&right_end_transform,
567+
&(&right_start_transform..&right_end_transform),
568568
) {
569569
match *strategy {
570570
CollisionOnly => {
@@ -670,7 +670,7 @@ mod tests {
670670
&right,
671671
&right_transform
672672
)
673-
.is_none())
673+
.is_none());
674674
}
675675

676676
#[test]
@@ -770,23 +770,23 @@ mod tests {
770770
let contact = gjk
771771
.intersection_time_of_impact(
772772
&left,
773-
&left_start_transform..&left_end_transform,
773+
&(&left_start_transform..&left_end_transform),
774774
&right,
775-
&right_transform..&right_transform,
775+
&(&right_transform..&right_transform),
776776
)
777777
.unwrap();
778778

779-
assert_ulps_eq!(0.1666667, contact.time_of_impact);
779+
assert_ulps_eq!(0.166_666_7, contact.time_of_impact);
780780
assert_eq!(Vector2::new(-1., 0.), contact.normal);
781781
assert!(0. - contact.penetration_depth <= f32::EPSILON);
782782
assert_eq!(Point2::new(10., 0.), contact.contact_point);
783783

784784
assert!(gjk
785785
.intersection_time_of_impact(
786786
&left,
787-
&left_start_transform..&left_start_transform,
787+
&(&left_start_transform..&left_start_transform),
788788
&right,
789-
&right_transform..&right_transform
789+
&(&right_transform..&right_transform)
790790
)
791791
.is_none());
792792
}
@@ -803,23 +803,23 @@ mod tests {
803803
let contact = gjk
804804
.intersection_time_of_impact(
805805
&left,
806-
&left_start_transform..&left_end_transform,
806+
&(&left_start_transform..&left_end_transform),
807807
&right,
808-
&right_transform..&right_transform,
808+
&(&right_transform..&right_transform),
809809
)
810810
.unwrap();
811811

812-
assert_ulps_eq!(0.1666667, contact.time_of_impact);
812+
assert_ulps_eq!(0.166_666_7, contact.time_of_impact);
813813
assert_eq!(Vector3::new(-1., 0., 0.), contact.normal);
814814
assert!(0. - contact.penetration_depth <= f32::EPSILON);
815815
assert_eq!(Point3::new(10., 0., 0.), contact.contact_point);
816816

817817
assert!(gjk
818818
.intersection_time_of_impact(
819819
&left,
820-
&left_start_transform..&left_start_transform,
820+
&(&left_start_transform..&left_start_transform),
821821
&right,
822-
&right_transform..&right_transform
822+
&(&right_transform..&right_transform)
823823
)
824824
.is_none());
825825
}

src/lib.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@
1212
rust_2018_idioms,
1313
nonstandard_style,
1414
unused,
15-
future_incompatible
15+
future_incompatible,
16+
clippy::semicolon_if_nothing_returned,
17+
clippy::unreadable_literal,
18+
clippy::unseparated_literal_suffix,
19+
clippy::needless_pass_by_value
1620
)]
1721
#![allow(clippy::excessive_precision)]
1822

src/primitive/capsule.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ mod tests {
230230
let direction = Vector3::new(0.5, -1., 0.).normalize();
231231
let transform = transform(0., 0., 0., 0.);
232232
let point = capsule.support_point(&direction, &transform);
233-
assert_ulps_eq!(Point3::new(0.44721365, -2.8944273, 0.), point);
233+
assert_ulps_eq!(Point3::new(0.447_213_65, -2.894_427_3, 0.), point);
234234
}
235235

236236
#[test]
@@ -327,9 +327,9 @@ mod tests {
327327
);
328328
assert_eq!(
329329
Some(Point3::new(
330-
0.10102588514869944,
331-
2.989741148513006,
332-
0.10102588514869944
330+
0.101_025_885_148_699_44,
331+
2.989_741_148_513_006,
332+
0.101_025_885_148_699_44
333333
)),
334334
capsule.intersection(&ray)
335335
);

src/primitive/circle.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ mod tests {
106106

107107
#[test]
108108
fn test_circle_far_2() {
109-
test_circle(1., 1., 7.0710677, 7.0710677, 0.);
109+
test_circle(1., 1., 7.071_067_7, 7.071_067_7, 0.);
110110
}
111111

112112
#[test]
@@ -126,7 +126,7 @@ mod tests {
126126
#[test]
127127
fn test_circle_bound() {
128128
let circle = Circle::new(10.);
129-
assert_eq!(bound(-10., -10., 10., 10.), circle.compute_bound())
129+
assert_eq!(bound(-10., -10., 10., 10.), circle.compute_bound());
130130
}
131131

132132
#[test]

src/primitive/cuboid.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ mod tests {
223223
#[test]
224224
fn test_rectangle_bound() {
225225
let r = Cuboid::new(10., 10., 10.);
226-
assert_eq!(bound(-5., -5., -5., 5., 5., 5.), r.compute_bound())
226+
assert_eq!(bound(-5., -5., -5., 5., 5., 5.), r.compute_bound());
227227
}
228228

229229
#[test]
@@ -271,7 +271,7 @@ mod tests {
271271
let ray = Ray3::new(Point3::new(10., 0., 0.), Vector3::new(-1., 0., 0.));
272272
let t = transform(0., 0., 0., 0.3);
273273
let p = cuboid.intersection_transformed(&ray, &t).unwrap();
274-
assert_ulps_eq!(5.233758, p.x);
274+
assert_ulps_eq!(5.233_758, p.x);
275275
assert_ulps_eq!(0., p.y);
276276
assert_ulps_eq!(0., p.z);
277277
}

src/primitive/particle.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ mod tests {
204204
fn test_continuous() {
205205
let circle = Circle::new(4.);
206206
assert_ulps_eq!(
207-
Point2::new(-2.8284271247461903, -2.8284271247461903),
207+
Point2::new(-2.828_427_124_746_190_3, -2.828_427_124_746_190_3),
208208
circle
209209
.intersection(&(Particle::new(), Point2::new(-5., -5.)..Point2::new(5., 5.)))
210210
.unwrap()
@@ -223,7 +223,7 @@ mod tests {
223223
let circle = Circle::new(4.);
224224
let t = transform(0., 0., 0.);
225225
assert_ulps_eq!(
226-
Point2::new(-2.8284271247461903, -2.8284271247461903),
226+
Point2::new(-2.828_427_124_746_190_3, -2.828_427_124_746_190_3),
227227
circle
228228
.intersection_transformed(
229229
&(Particle::new(), Point2::new(-5., -5.)..Point2::new(5., 5.)),

src/primitive/polygon.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ mod tests {
408408
assert_eq!(None, polygon.intersection_transformed(&ray, &t));
409409
let t = transform(0., 0., 0.3);
410410
let p = polygon.intersection_transformed(&ray, &t).unwrap();
411-
assert_ulps_eq!(0.38913357, p.x);
411+
assert_ulps_eq!(0.389_133_57, p.x);
412412
assert_ulps_eq!(6.8, p.y);
413413
}
414414

0 commit comments

Comments
 (0)